test: initial attempt at tests with Claude Code

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.github/workflows/ci.yml

@@ -0,0 +1,56 @@
+name: CI Build and Test
+
+on:
+  push:
+    branches: [ main, develop, net8-updates ]
+  pull_request:
+    branches: [ main, develop, net8-updates ]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '8.0.x'
+    
+    - name: Restore dependencies
+      run: dotnet restore
+      
+    - name: Build
+      run: dotnet build --configuration Release --no-restore
+      
+    - name: Run tests
+      run: dotnet test --no-restore --verbosity normal --collect:"XPlat Code Coverage" --results-directory ./coverage
+      
+    - name: Generate coverage report
+      uses: danielpalme/ReportGenerator-GitHub-Action@5.2.0
+      with:
+        reports: coverage/**/coverage.cobertura.xml
+        targetdir: coverage-report
+        reporttypes: Html;Cobertura;MarkdownSummary
+        
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v3
+      with:
+        file: ./coverage-report/Cobertura.xml
+        flags: unittests
+        name: codecov-umbrella
+        fail_ci_if_error: false
+        
+    - name: Write coverage summary
+      run: cat coverage-report/Summary.md >> $GITHUB_STEP_SUMMARY
+      if: always()
+      
+    - name: Upload test results
+      uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        name: test-results
+        path: |
+          coverage/
+          coverage-report/

.github/workflows/essentials-3-dev-build.yml

@@ -0,0 +1,247 @@
+name: Essentials v3 Development Build
+
+on:
+  push:
+    branches:
+      - feature-3.0.0/*
+      - hotfix-3.0.0/*
+      - release-3.0.0/*
+      - development-3.0.0
+
+env:
+  SOLUTION_PATH: .
+  SOLUTION_FILE: PepperDash.Essentials
+  VERSION: 0.0.0-buildtype-buildnumber
+  BUILD_TYPE: Debug
+  RELEASE_BRANCH: main
+jobs:
+  Build_Project_4-Series:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      
+      # Detect environment (Act vs GitHub)
+      - name: Detect environment
+        id: detect_env
+        run: |
+          if [ -n "$ACT" ]; then
+            echo "is_local=true" >> $GITHUB_OUTPUT
+          else
+            echo "is_local=false" >> $GITHUB_OUTPUT
+          fi
+          
+      - name: Install prerequisites
+        run: |
+          if [ "${{ steps.detect_env.outputs.is_local }}" == "true" ]; then
+            # For Act - no sudo needed
+            apt-get update
+            apt-get install -y curl wget libicu-dev git unzip
+          else
+            # For GitHub runners - sudo required
+            sudo apt-get update
+            sudo apt-get install -y curl wget libicu-dev git unzip
+          fi
+          
+      - name: Set Version Number
+        id: setVersion
+        shell: bash
+        run: |
+          latestVersion="3.0.0"
+          newVersion=$latestVersion
+          phase=""
+          newVersionString=""
+          
+          if [[ $GITHUB_REF =~ ^refs/pull/.* ]]; then
+            phase="beta"
+            newVersionString="${newVersion}-${phase}-${GITHUB_RUN_NUMBER}"
+          elif [[ $GITHUB_REF =~ ^refs/heads/hotfix-3.0.0/.* ]]; then
+            phase="hotfix"
+            newVersionString="${newVersion}-${phase}-${GITHUB_RUN_NUMBER}"
+          elif [[ $GITHUB_REF =~ ^refs/heads/feature-3.0.0/.* ]]; then
+            phase="alpha"
+            newVersionString="${newVersion}-${phase}-${GITHUB_RUN_NUMBER}"
+          elif [[ $GITHUB_REF == "refs/heads/development-3.0.0" ]]; then
+            phase="beta"
+            newVersionString="${newVersion}-${phase}-${GITHUB_RUN_NUMBER}"
+          elif [[ $GITHUB_REF =~ ^refs/heads/release-3.0.0/.* ]]; then
+            version=$(echo $GITHUB_REF | awk -F '/' '{print $NF}' | sed 's/v//')
+            phase="rc"
+            newVersionString="${version}-${phase}-${GITHUB_RUN_NUMBER}"
+          else
+            # For local builds or unrecognized branches
+            newVersionString="${newVersion}-local"
+          fi
+          
+          echo "version=$newVersionString" >> $GITHUB_OUTPUT
+      
+      # Create Build Properties file
+      - name: Create Build Properties
+        run: |
+          cat > Directory.Build.props << EOF
+          <Project>
+            <PropertyGroup>
+              <Version>${{ steps.setVersion.outputs.version }}</Version>
+              <AssemblyVersion>${{ steps.setVersion.outputs.version }}</AssemblyVersion>
+              <FileVersion>${{ steps.setVersion.outputs.version }}</FileVersion>
+              <InformationalVersion>${{ steps.setVersion.outputs.version }}</InformationalVersion>
+              <PackageVersion>${{ steps.setVersion.outputs.version }}</PackageVersion>
+              <NuGetVersion>${{ steps.setVersion.outputs.version }}</NuGetVersion>
+            </PropertyGroup>
+          </Project>
+          EOF
+          
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '8.0.x'
+          
+      - name: Restore NuGet Packages
+        run: dotnet restore ${SOLUTION_FILE}.sln
+        
+      - name: Build Solution
+        run: dotnet build ${SOLUTION_FILE}.sln --configuration ${BUILD_TYPE} --no-restore
+      
+      # Copy the CPZ file to the output directory with version in the filename
+      - name: Copy and Rename CPZ Files
+        run: |
+          mkdir -p ./output/cpz
+          
+          # Find the main CPZ file in the build output
+          if [ -f "./src/PepperDash.Essentials/bin/${BUILD_TYPE}/net8/PepperDashEssentials.cpz" ]; then
+            cp "./src/PepperDash.Essentials/bin/${BUILD_TYPE}/net8/PepperDashEssentials.cpz" "./output/cpz/PepperDashEssentials.${{ steps.setVersion.outputs.version }}.cpz"
+            echo "Main CPZ file copied and renamed successfully."
+          else
+            echo "Warning: Main CPZ file not found at expected location."
+            find ./src -name "*.cpz" | xargs -I {} cp {} ./output/cpz/
+          fi
+        
+      - name: Pack Solution
+        run: dotnet pack ${SOLUTION_FILE}.sln --configuration ${BUILD_TYPE} --output ./output/nuget --no-build
+        
+      # List build artifacts (runs in both environments)
+      - name: List Build Artifacts
+        run: |
+          echo "=== Build Artifacts ==="
+          echo "NuGet Packages:"
+          find ./output/nuget -type f | sort
+          echo ""
+          echo "CPZ/CPLZ Files:"
+          find ./output -name "*.cpz" -o -name "*.cplz" | sort
+          echo "======================="
+        
+      # Enhanced package inspection for local runs
+      - name: Inspect NuGet Packages
+        if: steps.detect_env.outputs.is_local == 'true'
+        run: |
+          echo "=== NuGet Package Details ==="
+          for pkg in $(find ./output/nuget -name "*.nupkg"); do
+            echo "Package: $(basename "$pkg")"
+            echo "Size: $(du -h "$pkg" | cut -f1)"
+            
+            # Extract and show package contents
+            echo "Contents:"
+            unzip -l "$pkg" | tail -n +4 | head -n -2
+            echo "--------------------------"
+            
+            # Try to extract and show the nuspec file (contains metadata)
+            echo "Metadata:"
+            unzip -p "$pkg" "*.nuspec" 2>/dev/null | grep -E "(<id>|<version>|<description>|<authors>|<dependencies>)" || echo "Metadata extraction failed"
+            echo "--------------------------"
+          done
+          echo "==========================="
+      
+      # Tag creation - GitHub version
+      - name: Create tag for non-rc builds (GitHub)
+        if: ${{ !contains(steps.setVersion.outputs.version, 'rc') && steps.detect_env.outputs.is_local == 'false' }}
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
+          git tag ${{ steps.setVersion.outputs.version }}
+          git push --tags origin
+          
+      # Tag creation - Act mock version
+      - name: Create tag for non-rc builds (Act Mock)
+        if: ${{ !contains(steps.setVersion.outputs.version, 'rc') && steps.detect_env.outputs.is_local == 'true' }}
+        run: |
+          echo "Would create git tag: ${{ steps.setVersion.outputs.version }}"
+          echo "Would push tag to: origin"
+          
+      # Release creation - GitHub version
+      - name: Create Release (GitHub)
+        if: steps.detect_env.outputs.is_local == 'false'
+        id: create_release
+        uses: ncipollo/release-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          artifacts: 'output/cpz/*,output/**/*.cplz'
+          generateReleaseNotes: true
+          prerelease: ${{contains('debug', env.BUILD_TYPE)}}
+          tag: ${{ steps.setVersion.outputs.version }}
+          
+      # Release creation - Act mock version with enhanced output
+      - name: Create Release (Act Mock)
+        if: steps.detect_env.outputs.is_local == 'true'
+        run: |
+          echo "=== Mock Release Creation ==="
+          echo "Would create release with:"
+          echo "- Tag: ${{ steps.setVersion.outputs.version }}"
+          echo "- Prerelease: ${{contains('debug', env.BUILD_TYPE)}}"
+          echo "- Artifacts matching pattern: output/cpz/*,output/**/*.cplz"
+          echo ""
+          echo "Matching artifacts:"
+          find ./output/cpz -type f
+          find ./output -name "*.cplz"
+          
+          # Detailed info about release artifacts
+          echo ""
+          echo "Artifact Details:"
+          for artifact in $(find ./output/cpz -type f; find ./output -name "*.cplz"); do
+            echo "File: $(basename "$artifact")"
+            echo "Size: $(du -h "$artifact" | cut -f1)"
+            echo "Created: $(stat -c %y "$artifact")"
+            echo "MD5: $(md5sum "$artifact" | cut -d' ' -f1)"
+            echo "--------------------------"
+          done
+          echo "============================"
+          
+      # NuGet setup - GitHub version
+      - name: Setup NuGet (GitHub)
+        if: steps.detect_env.outputs.is_local == 'false'
+        run: |
+          dotnet nuget add source https://nuget.pkg.github.com/pepperdash/index.json -n github -u pepperdash -p ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text
+          
+      # NuGet setup - Act mock version
+      - name: Setup NuGet (Act Mock)
+        if: steps.detect_env.outputs.is_local == 'true'
+        run: |
+          echo "=== Mock NuGet Setup ==="
+          echo "Would add GitHub NuGet source: https://nuget.pkg.github.com/pepperdash/index.json"
+          echo "======================="
+          
+      # Publish to NuGet - GitHub version
+      - name: Publish to Nuget (GitHub)
+        if: steps.detect_env.outputs.is_local == 'false'
+        run: dotnet nuget push ./output/nuget/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
+        
+      # Publish to NuGet - Act mock version
+      - name: Publish to Nuget (Act Mock)
+        if: steps.detect_env.outputs.is_local == 'true'
+        run: |
+          echo "=== Mock Publish to NuGet ==="
+          echo "Would publish the following packages to https://api.nuget.org/v3/index.json:"
+          find ./output/nuget -name "*.nupkg" | sort
+          echo "============================="
+          
+      # Publish to GitHub NuGet - GitHub version
+      - name: Publish to Github Nuget (GitHub)
+        if: steps.detect_env.outputs.is_local == 'false'
+        run: dotnet nuget push ./output/nuget/*.nupkg --source github --api-key ${{ secrets.GITHUB_TOKEN }}
+        
+      # Publish to GitHub NuGet - Act mock version
+      - name: Publish to Github Nuget (Act Mock)
+        if: steps.detect_env.outputs.is_local == 'true'
+        run: |
+          echo "=== Mock Publish to GitHub NuGet ==="
+          echo "Would publish the following packages to the GitHub NuGet registry:"
+          find ./output/nuget -name "*.nupkg" | sort
+          echo "=================================="

PepperDash.Essentials.Tests.sln

@@ -0,0 +1,42 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A8B8F24D-3181-45BF-9ED3-F734E04F0BC8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Core", "src\PepperDash.Core\PepperDash.Core.csproj", "{1E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials.Core", "src\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj", "{2E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B8B8F24D-3181-45BF-9ED3-F734E04F0BC9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials.Core.Tests", "tests\PepperDash.Essentials.Core.Tests\PepperDash.Essentials.Core.Tests.csproj", "{3E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7C}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{1E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7A} = {A8B8F24D-3181-45BF-9ED3-F734E04F0BC8}
+		{2E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7B} = {A8B8F24D-3181-45BF-9ED3-F734E04F0BC8}
+		{3E5D8C7C-A4D0-4D0E-A6B0-9E3F3D9C8B7C} = {B8B8F24D-3181-45BF-9ED3-F734E04F0BC9}
+	EndGlobalSection
+EndGlobal

TESTING_STRATEGY.md

@@ -0,0 +1,166 @@
+# PepperDash Essentials Unit Testing Strategy
+
+## Problem Statement
+The PepperDash Essentials framework is tightly coupled to Crestron hardware libraries that only run on Crestron devices, making it impossible to run unit tests on development machines or in CI/CD pipelines.
+
+## Solution: Abstraction Layer Pattern
+
+### 1. Core Abstractions Created
+We've implemented abstraction interfaces that decouple business logic from Crestron hardware:
+
+- **`ICrestronControlSystem`** - Abstracts the control system hardware
+- **`IRelayPort`** - Abstracts relay functionality
+- **`IDigitalInput`** - Abstracts digital inputs with event handling
+- **`IVersiPort`** - Abstracts VersiPort I/O
+
+### 2. Adapter Pattern Implementation
+Created adapter classes that wrap Crestron objects in production:
+
+```csharp
+// Production code uses adapters
+var controlSystem = new CrestronControlSystemAdapter(Global.ControlSystem);
+var processor = new CrestronProcessorTestable("key", controlSystem);
+
+// Test code uses mocks
+var mockControlSystem = new Mock<ICrestronControlSystem>();
+var processor = new CrestronProcessorTestable("key", mockControlSystem.Object);
+```
+
+### 3. Testable Classes
+Refactored classes to accept abstractions via dependency injection:
+
+- **`CrestronProcessorTestable`** - Accepts `ICrestronControlSystem`
+- **`GenericRelayDeviceTestable`** - Accepts `IRelayPort`
+
+## Implementation Steps
+
+### Step 1: Identify Dependencies
+```bash
+# Find Crestron dependencies
+grep -r "using Crestron" --include="*.cs"
+```
+
+### Step 2: Create Abstractions
+Define interfaces that mirror the Crestron API surface you need:
+```csharp
+public interface IRelayPort
+{
+    void Open();
+    void Close();
+    void Pulse(int delayMs);
+    bool State { get; }
+}
+```
+
+### Step 3: Implement Adapters
+Wrap Crestron objects with adapters:
+```csharp
+public class RelayPortAdapter : IRelayPort
+{
+    private readonly Relay _relay;
+    public void Open() => _relay.Open();
+    // ... other methods
+}
+```
+
+### Step 4: Refactor Classes
+Accept abstractions in constructors:
+```csharp
+public class CrestronProcessorTestable
+{
+    public CrestronProcessorTestable(string key, ICrestronControlSystem processor)
+    {
+        // Use abstraction instead of concrete type
+    }
+}
+```
+
+### Step 5: Write Tests
+Use mocking frameworks to test business logic:
+```csharp
+[Fact]
+public void OpenRelay_CallsRelayPortOpen()
+{
+    var mockRelay = new Mock<IRelayPort>();
+    var device = new GenericRelayDeviceTestable("test", mockRelay.Object);
+    
+    device.OpenRelay();
+    
+    mockRelay.Verify(r => r.Open(), Times.Once);
+}
+```
+
+## Test Project Structure
+```
+tests/
+├── PepperDash.Essentials.Core.Tests/
+│   ├── Abstractions/           # Tests for abstraction adapters
+│   ├── Devices/                # Device-specific tests
+│   └── *.csproj                # Test project file
+└── README.md                    # Testing documentation
+```
+
+## CI/CD Integration
+
+### GitHub Actions Workflow
+The `.github/workflows/ci.yml` file runs tests automatically on:
+- Push to main/develop branches
+- Pull requests
+- Generates code coverage reports
+
+### Running Tests Locally
+```bash
+# Run all tests
+dotnet test
+
+# Run with coverage
+dotnet test --collect:"XPlat Code Coverage"
+
+# Run specific tests
+dotnet test --filter "FullyQualifiedName~CrestronProcessor"
+```
+
+## Benefits
+
+1. **Unit Testing Without Hardware** - Tests run on any machine
+2. **CI/CD Integration** - Automated testing in pipelines
+3. **Better Design** - Encourages SOLID principles
+4. **Faster Development** - No need for hardware to test logic
+5. **Higher Code Quality** - Catch bugs before deployment
+
+## Migration Guide
+
+### For Existing Code
+1. Identify classes with Crestron dependencies
+2. Create abstraction interfaces
+3. Implement adapters
+4. Create testable versions accepting abstractions
+5. Write unit tests
+
+### For New Code
+1. Always code against abstractions, not Crestron types
+2. Use dependency injection
+3. Write tests first (TDD approach)
+
+## Current Test Coverage
+- ✅ CrestronProcessor relay management
+- ✅ GenericRelayDevice operations
+- ✅ Digital input event handling
+- ✅ VersiPort analog/digital operations
+
+## Next Steps
+1. Expand abstractions for more Crestron components
+2. Increase test coverage across all modules
+3. Add integration tests with mock hardware
+4. Document testing best practices
+5. Create code generation tools for adapters
+
+## Tools Used
+- **xUnit** - Test framework
+- **Moq** - Mocking library
+- **FluentAssertions** - Readable assertions
+- **Coverlet** - Code coverage
+- **GitHub Actions** - CI/CD
+
+## Summary
+By introducing an abstraction layer between the business logic and Crestron hardware dependencies, we've successfully enabled unit testing for the PepperDash Essentials framework. This approach allows development and testing without physical hardware while maintaining full compatibility with Crestron systems in production.

runtimeconfig.json

@@ -0,0 +1,7 @@
+{
+  "runtimeOptions": {
+    "configProperties": {
+      "System.Globalization.Invariant": false
+    }
+  }
+}

src/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.4.0-local</Version>
+    <Version>3.0.0-local</Version>
     <InformationalVersion>$(Version)</InformationalVersion>
     <Authors>PepperDash Technology</Authors>
     <Company>PepperDash Technology</Company>

src/PepperDash.Core/Comm/CommunicationGather.cs

@@ -8,8 +8,8 @@ using Crestron.SimplSharp;
 using PepperDash.Core;
 
 
-namespace PepperDash.Core
-{
+namespace PepperDash.Core;
+
 	/// <summary>
 	/// Defines the string event handler for line events on the gather
 	/// </summary>
@@ -30,7 +30,7 @@ namespace PepperDash.Core
 		/// <summary>
 		/// The communication port that this gathers on
 		/// </summary>
-        public ICommunicationReceiver Port { get; private set; }
+    public ICommunicationReceiver Port { get; private set; }
 
 		/// <summary>
 		/// Default false. If true, the delimiter will be included in the line output
@@ -67,22 +67,22 @@ namespace PepperDash.Core
 		/// </summary>
 		/// <param name="port"></param>
 		/// <param name="delimiter"></param>
-        public CommunicationGather(ICommunicationReceiver port, string delimiter)
-            :this(port, new string[] { delimiter} )
+    public CommunicationGather(ICommunicationReceiver port, string delimiter)
+        :this(port, new string[] { delimiter} )
 		{
 		}
 
-        /// <summary>
-        /// Constructor for using an array of string delimiters
-        /// </summary>
-        /// <param name="port"></param>
-        /// <param name="delimiters"></param>
-        public CommunicationGather(ICommunicationReceiver port, string[] delimiters)
-        {
-            Port = port;
-            StringDelimiters = delimiters;
-            port.TextReceived += Port_TextReceivedStringDelimiter;
-        }
+    /// <summary>
+    /// Constructor for using an array of string delimiters
+    /// </summary>
+    /// <param name="port"></param>
+    /// <param name="delimiters"></param>
+    public CommunicationGather(ICommunicationReceiver port, string[] delimiters)
+    {
+        Port = port;
+        StringDelimiters = delimiters;
+        port.TextReceived += Port_TextReceivedStringDelimiter;
+    }
 
 		/// <summary>
 		/// Disconnects this gather from the Port's TextReceived event. This will not fire LineReceived
@@ -136,35 +136,35 @@ namespace PepperDash.Core
 				ReceiveBuffer.Append(args.Text);
 				var str = ReceiveBuffer.ToString();
 
-                // Case: Receiving DEVICE get version\x0d\0x0a+OK "value":"1234"\x0d\x0a
+            // Case: Receiving DEVICE get version\x0d\0x0a+OK "value":"1234"\x0d\x0a
 
-                // RX: DEV
-                //  Split: (1) "DEV"
-                // RX: I
-                //  Split: (1) "DEVI"
-                // RX: CE get version
-                //  Split: (1) "DEVICE get version"
-                // RX: \x0d\x0a+OK "value":"1234"\x0d\x0a
-                //  Split: (2) DEVICE get version, +OK "value":"1234"
+            // RX: DEV
+            //  Split: (1) "DEV"
+            // RX: I
+            //  Split: (1) "DEVI"
+            // RX: CE get version
+            //  Split: (1) "DEVICE get version"
+            // RX: \x0d\x0a+OK "value":"1234"\x0d\x0a
+            //  Split: (2) DEVICE get version, +OK "value":"1234"
 
-                // Iterate the delimiters and fire an event for any matching delimiter
-                foreach (var delimiter in StringDelimiters)
+            // Iterate the delimiters and fire an event for any matching delimiter
+            foreach (var delimiter in StringDelimiters)
+            {
+                var lines = Regex.Split(str, delimiter);
+                if (lines.Length == 1)
+                    continue;
+              
+                for (int i = 0; i < lines.Length - 1; i++)
                 {
-                    var lines = Regex.Split(str, delimiter);
-                    if (lines.Length == 1)
-                        continue;
-                  
-                    for (int i = 0; i < lines.Length - 1; i++)
-                    {
-                        string strToSend = null;
-                        if (IncludeDelimiter)
-                            strToSend = lines[i] + delimiter;
-                        else
-                            strToSend = lines[i];
-                        handler(this, new GenericCommMethodReceiveTextArgs(strToSend, delimiter));
-                    }
-                    ReceiveBuffer = new StringBuilder(lines[lines.Length - 1]);          
+                    string strToSend = null;
+                    if (IncludeDelimiter)
+                        strToSend = lines[i] + delimiter;
+                    else
+                        strToSend = lines[i];
+                    handler(this, new GenericCommMethodReceiveTextArgs(strToSend, delimiter));
                 }
+                ReceiveBuffer = new StringBuilder(lines[lines.Length - 1]);          
+            }
 			}
 		}
 
@@ -175,5 +175,4 @@ namespace PepperDash.Core
 		{
 			Stop();
 		}
-	}
-}
+	}

src/PepperDash.Core/Comm/CommunicationStreamDebugging.cs

@@ -5,173 +5,172 @@ using System.Text;
 using Crestron.SimplSharp;
 using PepperDash.Core;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Controls the ability to disable/enable debugging of TX/RX data sent to/from a device with a built in timer to disable
+/// </summary>
+public class CommunicationStreamDebugging
 {
     /// <summary>
-    /// Controls the ability to disable/enable debugging of TX/RX data sent to/from a device with a built in timer to disable
+    /// Device Key that this instance configures
     /// </summary>
-    public class CommunicationStreamDebugging
+    public string ParentDeviceKey { get; private set; }
+
+    /// <summary>
+    /// Timer to disable automatically if not manually disabled
+    /// </summary>
+    private CTimer DebugExpiryPeriod;
+
+    /// <summary>
+    /// The current debug setting
+    /// </summary>
+    public eStreamDebuggingSetting DebugSetting { get; private set; }
+
+    private uint _DebugTimeoutInMs;
+    private const uint _DefaultDebugTimeoutMin = 30;
+
+    /// <summary>
+    /// Timeout in Minutes
+    /// </summary>
+    public uint DebugTimeoutMinutes
     {
-        /// <summary>
-        /// Device Key that this instance configures
-        /// </summary>
-        public string ParentDeviceKey { get; private set; }
-
-        /// <summary>
-        /// Timer to disable automatically if not manually disabled
-        /// </summary>
-        private CTimer DebugExpiryPeriod;
-
-        /// <summary>
-        /// The current debug setting
-        /// </summary>
-        public eStreamDebuggingSetting DebugSetting { get; private set; }
-
-        private uint _DebugTimeoutInMs;
-        private const uint _DefaultDebugTimeoutMin = 30;
-
-        /// <summary>
-        /// Timeout in Minutes
-        /// </summary>
-        public uint DebugTimeoutMinutes
+        get
         {
-            get
-            {
-                return _DebugTimeoutInMs/60000;
-            }
-        }
-
-        /// <summary>
-        /// Indicates that receive stream debugging is enabled
-        /// </summary>
-        public bool RxStreamDebuggingIsEnabled{ get; private set; }
-
-        /// <summary>
-        /// Indicates that transmit stream debugging is enabled
-        /// </summary>
-        public bool TxStreamDebuggingIsEnabled { get; private set; }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="parentDeviceKey"></param>
-        public CommunicationStreamDebugging(string parentDeviceKey)
-        {
-            ParentDeviceKey = parentDeviceKey;
-        }
-
-
-        /// <summary>
-        /// Sets the debugging setting and if not setting to off, assumes the default of 30 mintues
-        /// </summary>
-        /// <param name="setting"></param>
-        public void SetDebuggingWithDefaultTimeout(eStreamDebuggingSetting setting)
-        {
-            if (setting == eStreamDebuggingSetting.Off)
-            {
-                DisableDebugging();
-                return;
-            }
-
-            SetDebuggingWithSpecificTimeout(setting, _DefaultDebugTimeoutMin);
-        }
-
-        /// <summary>
-        /// Sets the debugging setting for the specified number of minutes
-        /// </summary>
-        /// <param name="setting"></param>
-        /// <param name="minutes"></param>
-        public void SetDebuggingWithSpecificTimeout(eStreamDebuggingSetting setting, uint minutes)
-        {
-            if (setting == eStreamDebuggingSetting.Off)
-            {
-                DisableDebugging();
-                return;
-            }
-
-            _DebugTimeoutInMs = minutes * 60000;
-
-            StopDebugTimer();
-
-            DebugExpiryPeriod = new CTimer((o) => DisableDebugging(), _DebugTimeoutInMs);
-
-            if ((setting & eStreamDebuggingSetting.Rx) == eStreamDebuggingSetting.Rx)
-                RxStreamDebuggingIsEnabled = true;
-
-            if ((setting & eStreamDebuggingSetting.Tx) == eStreamDebuggingSetting.Tx)
-                TxStreamDebuggingIsEnabled = true;
-
-            Debug.SetDeviceDebugSettings(ParentDeviceKey, setting);
-        
-        }
-
-        /// <summary>
-        /// Disabled debugging
-        /// </summary>
-        private void DisableDebugging()
-        {
-            StopDebugTimer();
-
-            Debug.SetDeviceDebugSettings(ParentDeviceKey, eStreamDebuggingSetting.Off);
-        }
-
-        private void StopDebugTimer()
-        {
-            RxStreamDebuggingIsEnabled = false;
-            TxStreamDebuggingIsEnabled = false;
-
-            if (DebugExpiryPeriod == null)
-            {
-                return;
-            }
-
-            DebugExpiryPeriod.Stop();
-            DebugExpiryPeriod.Dispose();
-            DebugExpiryPeriod = null;
+            return _DebugTimeoutInMs/60000;
         }
     }
 
     /// <summary>
-    /// The available settings for stream debugging
+    /// Indicates that receive stream debugging is enabled
     /// </summary>
-    [Flags]
-    public enum eStreamDebuggingSetting
+    public bool RxStreamDebuggingIsEnabled{ get; private set; }
+
+    /// <summary>
+    /// Indicates that transmit stream debugging is enabled
+    /// </summary>
+    public bool TxStreamDebuggingIsEnabled { get; private set; }
+
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    /// <param name="parentDeviceKey"></param>
+    public CommunicationStreamDebugging(string parentDeviceKey)
     {
-        /// <summary>
-        /// Debug off
-        /// </summary>
-        Off = 0,
-        /// <summary>
-        /// Debug received data
-        /// </summary>
-        Rx = 1, 
-        /// <summary>
-        /// Debug transmitted data
-        /// </summary>
-        Tx = 2,
-        /// <summary>
-        /// Debug both received and transmitted data
-        /// </summary>
-        Both = Rx | Tx
+        ParentDeviceKey = parentDeviceKey;
+    }
+
+
+    /// <summary>
+    /// Sets the debugging setting and if not setting to off, assumes the default of 30 mintues
+    /// </summary>
+    /// <param name="setting"></param>
+    public void SetDebuggingWithDefaultTimeout(eStreamDebuggingSetting setting)
+    {
+        if (setting == eStreamDebuggingSetting.Off)
+        {
+            DisableDebugging();
+            return;
+        }
+
+        SetDebuggingWithSpecificTimeout(setting, _DefaultDebugTimeoutMin);
     }
 
     /// <summary>
-    /// The available settings for stream debugging response types
+    /// Sets the debugging setting for the specified number of minutes
     /// </summary>
-    [Flags]
-    public enum eStreamDebuggingDataTypeSettings
+    /// <param name="setting"></param>
+    /// <param name="minutes"></param>
+    public void SetDebuggingWithSpecificTimeout(eStreamDebuggingSetting setting, uint minutes)
     {
-        /// <summary>
-        /// Debug data in byte format
-        /// </summary>
-        Bytes = 0,
-        /// <summary>
-        /// Debug data in text format
-        /// </summary>
-        Text = 1,
-        /// <summary>
-        /// Debug data in both byte and text formats
-        /// </summary>
-        Both = Bytes | Text,
+        if (setting == eStreamDebuggingSetting.Off)
+        {
+            DisableDebugging();
+            return;
+        }
+
+        _DebugTimeoutInMs = minutes * 60000;
+
+        StopDebugTimer();
+
+        DebugExpiryPeriod = new CTimer((o) => DisableDebugging(), _DebugTimeoutInMs);
+
+        if ((setting & eStreamDebuggingSetting.Rx) == eStreamDebuggingSetting.Rx)
+            RxStreamDebuggingIsEnabled = true;
+
+        if ((setting & eStreamDebuggingSetting.Tx) == eStreamDebuggingSetting.Tx)
+            TxStreamDebuggingIsEnabled = true;
+
+        Debug.SetDeviceDebugSettings(ParentDeviceKey, setting);
+    
+    }
+
+    /// <summary>
+    /// Disabled debugging
+    /// </summary>
+    private void DisableDebugging()
+    {
+        StopDebugTimer();
+
+        Debug.SetDeviceDebugSettings(ParentDeviceKey, eStreamDebuggingSetting.Off);
+    }
+
+    private void StopDebugTimer()
+    {
+        RxStreamDebuggingIsEnabled = false;
+        TxStreamDebuggingIsEnabled = false;
+
+        if (DebugExpiryPeriod == null)
+        {
+            return;
+        }
+
+        DebugExpiryPeriod.Stop();
+        DebugExpiryPeriod.Dispose();
+        DebugExpiryPeriod = null;
     }
 }
+
+/// <summary>
+/// The available settings for stream debugging
+/// </summary>
+[Flags]
+public enum eStreamDebuggingSetting
+{
+    /// <summary>
+    /// Debug off
+    /// </summary>
+    Off = 0,
+    /// <summary>
+    /// Debug received data
+    /// </summary>
+    Rx = 1, 
+    /// <summary>
+    /// Debug transmitted data
+    /// </summary>
+    Tx = 2,
+    /// <summary>
+    /// Debug both received and transmitted data
+    /// </summary>
+    Both = Rx | Tx
+}
+
+/// <summary>
+/// The available settings for stream debugging response types
+/// </summary>
+[Flags]
+public enum eStreamDebuggingDataTypeSettings
+{
+    /// <summary>
+    /// Debug data in byte format
+    /// </summary>
+    Bytes = 0,
+    /// <summary>
+    /// Debug data in text format
+    /// </summary>
+    Text = 1,
+    /// <summary>
+    /// Debug data in both byte and text formats
+    /// </summary>
+    Both = Bytes | Text,
+}

src/PepperDash.Core/Comm/ControlPropertiesConfig.cs

@@ -3,91 +3,90 @@ using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Config properties that indicate how to communicate with a device for control
+/// </summary>
+public class ControlPropertiesConfig
 {
     /// <summary>
-    /// Config properties that indicate how to communicate with a device for control
+    /// The method of control
     /// </summary>
-    public class ControlPropertiesConfig
-    {
-        /// <summary>
-        /// The method of control
-        /// </summary>
-        [JsonProperty("method")]
-        [JsonConverter(typeof(StringEnumConverter))]
-        public eControlMethod Method { get; set; }
+    [JsonProperty("method")]
+    [JsonConverter(typeof(StringEnumConverter))]
+    public eControlMethod Method { get; set; }
 
-        /// <summary>
-        /// The key of the device that contains the control port
-        /// </summary>
-        [JsonProperty("controlPortDevKey", NullValueHandling = NullValueHandling.Ignore)]
-        public string ControlPortDevKey { get; set; }
+    /// <summary>
+    /// The key of the device that contains the control port
+    /// </summary>
+    [JsonProperty("controlPortDevKey", NullValueHandling = NullValueHandling.Ignore)]
+    public string ControlPortDevKey { get; set; }
 
-        /// <summary>
-        /// The number of the control port on the device specified by ControlPortDevKey
-        /// </summary>
-        [JsonProperty("controlPortNumber", NullValueHandling = NullValueHandling.Ignore)] // In case "null" is present in config on this value
-        public uint? ControlPortNumber { get; set; }
+    /// <summary>
+    /// The number of the control port on the device specified by ControlPortDevKey
+    /// </summary>
+    [JsonProperty("controlPortNumber", NullValueHandling = NullValueHandling.Ignore)] // In case "null" is present in config on this value
+    public uint? ControlPortNumber { get; set; }
 
-        /// <summary>
-        /// The name of the control port on the device specified by ControlPortDevKey
-        /// </summary>
-        [JsonProperty("controlPortName", NullValueHandling = NullValueHandling.Ignore)] // In case "null" is present in config on this value
-        public string ControlPortName { get; set; }
+    /// <summary>
+    /// The name of the control port on the device specified by ControlPortDevKey
+    /// </summary>
+    [JsonProperty("controlPortName", NullValueHandling = NullValueHandling.Ignore)] // In case "null" is present in config on this value
+    public string ControlPortName { get; set; }
 
-        /// <summary>
-        /// Properties for ethernet based communications
-        /// </summary>
-        [JsonProperty("tcpSshProperties", NullValueHandling = NullValueHandling.Ignore)]
-        public TcpSshPropertiesConfig TcpSshProperties { get; set; }
+    /// <summary>
+    /// Properties for ethernet based communications
+    /// </summary>
+    [JsonProperty("tcpSshProperties", NullValueHandling = NullValueHandling.Ignore)]
+    public TcpSshPropertiesConfig TcpSshProperties { get; set; }
 
-        /// <summary>
-        /// The filename and path for the IR file
-        /// </summary>
-        [JsonProperty("irFile", NullValueHandling = NullValueHandling.Ignore)]
-        public string IrFile { get; set; }
+    /// <summary>
+    /// The filename and path for the IR file
+    /// </summary>
+    [JsonProperty("irFile", NullValueHandling = NullValueHandling.Ignore)]
+    public string IrFile { get; set; }
 
-        /// <summary>
-        /// The IpId of a Crestron device
-        /// </summary>
-        [JsonProperty("ipId", NullValueHandling = NullValueHandling.Ignore)]
-        public string IpId { get; set; }
+    /// <summary>
+    /// The IpId of a Crestron device
+    /// </summary>
+    [JsonProperty("ipId", NullValueHandling = NullValueHandling.Ignore)]
+    public string IpId { get; set; }
 
-        /// <summary>
-        /// Readonly uint representation of the IpId
-        /// </summary>
-        [JsonIgnore]
-        public uint IpIdInt { get { return Convert.ToUInt32(IpId, 16); } }
+    /// <summary>
+    /// Readonly uint representation of the IpId
+    /// </summary>
+    [JsonIgnore]
+    public uint IpIdInt { get { return Convert.ToUInt32(IpId, 16); } }
 
-        /// <summary>
-        /// Char indicating end of line
-        /// </summary>
-        [JsonProperty("endOfLineChar", NullValueHandling = NullValueHandling.Ignore)]
-        public char EndOfLineChar { get; set; }
+    /// <summary>
+    /// Char indicating end of line
+    /// </summary>
+    [JsonProperty("endOfLineChar", NullValueHandling = NullValueHandling.Ignore)]
+    public char EndOfLineChar { get; set; }
 
-        /// <summary>
-        /// Defaults to Environment.NewLine;
-        /// </summary>
-        [JsonProperty("endOfLineString", NullValueHandling = NullValueHandling.Ignore)]
-        public string EndOfLineString { get; set; }
+    /// <summary>
+    /// Defaults to Environment.NewLine;
+    /// </summary>
+    [JsonProperty("endOfLineString", NullValueHandling = NullValueHandling.Ignore)]
+    public string EndOfLineString { get; set; }
 
-        /// <summary>
-        /// Indicates 
-        /// </summary>
-        [JsonProperty("deviceReadyResponsePattern", NullValueHandling = NullValueHandling.Ignore)]
-        public string DeviceReadyResponsePattern { get; set; }
+    /// <summary>
+    /// Indicates 
+    /// </summary>
+    [JsonProperty("deviceReadyResponsePattern", NullValueHandling = NullValueHandling.Ignore)]
+    public string DeviceReadyResponsePattern { get; set; }
 
-        /// <summary>
-        /// Used when communcating to programs running in VC-4
-        /// </summary>
-        [JsonProperty("roomId", NullValueHandling = NullValueHandling.Ignore)]
-        public string RoomId { get; set; }
+    /// <summary>
+    /// Used when communcating to programs running in VC-4
+    /// </summary>
+    [JsonProperty("roomId", NullValueHandling = NullValueHandling.Ignore)]
+    public string RoomId { get; set; }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public ControlPropertiesConfig()
-        {            
-        }
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    public ControlPropertiesConfig()
+    {            
     }
 }

src/PepperDash.Core/Comm/EventArgs.cs

@@ -16,28 +16,28 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
 
 
-namespace PepperDash.Core
-{
-    /// <summary>
-    /// Delegate for notifying of socket status changes
-    /// </summary>
-    /// <param name="client"></param>
-    public delegate void GenericSocketStatusChangeEventDelegate(ISocketStatus client);
+namespace PepperDash.Core;
 
-    /// <summary>
-    /// EventArgs class for socket status changes
-    /// </summary>
+/// <summary>
+/// Delegate for notifying of socket status changes
+/// </summary>
+/// <param name="client"></param>
+public delegate void GenericSocketStatusChangeEventDelegate(ISocketStatus client);
+
+/// <summary>
+/// EventArgs class for socket status changes
+/// </summary>
 	public class GenericSocketStatusChageEventArgs : EventArgs
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ISocketStatus Client { get; private set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="client"></param>
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="client"></param>
 		public GenericSocketStatusChageEventArgs(ISocketStatus client)
 		{
 			Client = client;
@@ -46,105 +46,105 @@ namespace PepperDash.Core
 		/// S+ Constructor
 		/// </summary>
 		public GenericSocketStatusChageEventArgs() { }
-    }
+}
+
+/// <summary>
+/// Delegate for notifying of TCP Server state changes
+/// </summary>
+/// <param name="state"></param>
+public delegate void GenericTcpServerStateChangedEventDelegate(ServerState state);
+
+/// <summary>
+/// EventArgs class for TCP Server state changes
+/// </summary>
+public class GenericTcpServerStateChangedEventArgs : EventArgs
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public ServerState State { get; private set; }
 
     /// <summary>
-    /// Delegate for notifying of TCP Server state changes
+    /// 
     /// </summary>
     /// <param name="state"></param>
-    public delegate void GenericTcpServerStateChangedEventDelegate(ServerState state);
-
-    /// <summary>
-    /// EventArgs class for TCP Server state changes
-    /// </summary>
-    public class GenericTcpServerStateChangedEventArgs : EventArgs
+    public GenericTcpServerStateChangedEventArgs(ServerState state)
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        public ServerState State { get; private set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="state"></param>
-        public GenericTcpServerStateChangedEventArgs(ServerState state)
-        {
-            State = state;
-        }
+        State = state;
+    }
 		/// <summary>
 		/// S+ Constructor
 		/// </summary>
 		public GenericTcpServerStateChangedEventArgs() { }
+}
+
+/// <summary>
+/// Delegate for TCP Server socket status changes
+/// </summary>
+/// <param name="socket"></param>
+/// <param name="clientIndex"></param>
+/// <param name="clientStatus"></param>
+public delegate void GenericTcpServerSocketStatusChangeEventDelegate(object socket, uint clientIndex, SocketStatus clientStatus);
+/// <summary>
+/// EventArgs for TCP server socket status changes
+/// </summary>
+public class GenericTcpServerSocketStatusChangeEventArgs : EventArgs
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public object Socket { get; private set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public uint ReceivedFromClientIndex { get; private set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public SocketStatus ClientStatus { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="socket"></param>
+    /// <param name="clientStatus"></param>
+    public GenericTcpServerSocketStatusChangeEventArgs(object socket, SocketStatus clientStatus)
+    {
+        Socket = socket;
+        ClientStatus = clientStatus;
     }
 
     /// <summary>
-    /// Delegate for TCP Server socket status changes
+    /// 
     /// </summary>
     /// <param name="socket"></param>
     /// <param name="clientIndex"></param>
     /// <param name="clientStatus"></param>
-    public delegate void GenericTcpServerSocketStatusChangeEventDelegate(object socket, uint clientIndex, SocketStatus clientStatus);
-    /// <summary>
-    /// EventArgs for TCP server socket status changes
-    /// </summary>
-    public class GenericTcpServerSocketStatusChangeEventArgs : EventArgs
+    public GenericTcpServerSocketStatusChangeEventArgs(object socket, uint clientIndex, SocketStatus clientStatus)
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        public object Socket { get; private set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public uint ReceivedFromClientIndex { get; private set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public SocketStatus ClientStatus { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="socket"></param>
-        /// <param name="clientStatus"></param>
-        public GenericTcpServerSocketStatusChangeEventArgs(object socket, SocketStatus clientStatus)
-        {
-            Socket = socket;
-            ClientStatus = clientStatus;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="socket"></param>
-        /// <param name="clientIndex"></param>
-        /// <param name="clientStatus"></param>
-        public GenericTcpServerSocketStatusChangeEventArgs(object socket, uint clientIndex, SocketStatus clientStatus)
-        {
-            Socket = socket;
-            ReceivedFromClientIndex = clientIndex;
-            ClientStatus = clientStatus;
-        }
+        Socket = socket;
+        ReceivedFromClientIndex = clientIndex;
+        ClientStatus = clientStatus;
+    }
 		/// <summary>
 		/// S+ Constructor
 		/// </summary>
 		public GenericTcpServerSocketStatusChangeEventArgs() { }
-    }
+}
+
+/// <summary>
+/// EventArgs for TCP server com method receive text
+/// </summary>
+public class GenericTcpServerCommMethodReceiveTextArgs : EventArgs
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public uint ReceivedFromClientIndex { get; private set; }
 
     /// <summary>
-    /// EventArgs for TCP server com method receive text
+    /// 
     /// </summary>
-    public class GenericTcpServerCommMethodReceiveTextArgs : EventArgs
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        public uint ReceivedFromClientIndex { get; private set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
 		public ushort ReceivedFromClientIndexShort
 		{
 			get
@@ -153,99 +153,96 @@ namespace PepperDash.Core
 			}
 		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Text { get; private set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Text { get; private set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="text"></param>
-        public GenericTcpServerCommMethodReceiveTextArgs(string text)
-        {
-            Text = text;
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="text"></param>
+    public GenericTcpServerCommMethodReceiveTextArgs(string text)
+    {
+        Text = text;
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="text"></param>
-        /// <param name="clientIndex"></param>
-        public GenericTcpServerCommMethodReceiveTextArgs(string text, uint clientIndex)
-        {
-            Text = text;
-            ReceivedFromClientIndex = clientIndex;
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="text"></param>
+    /// <param name="clientIndex"></param>
+    public GenericTcpServerCommMethodReceiveTextArgs(string text, uint clientIndex)
+    {
+        Text = text;
+        ReceivedFromClientIndex = clientIndex;
+    }
 		/// <summary>
 		/// S+ Constructor
 		/// </summary>
 		public GenericTcpServerCommMethodReceiveTextArgs() { }
-    }
+}
+
+/// <summary>
+/// EventArgs for TCP server client ready for communication
+/// </summary>
+public class GenericTcpServerClientReadyForcommunicationsEventArgs : EventArgs
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool IsReady;
 
     /// <summary>
-    /// EventArgs for TCP server client ready for communication
+    /// 
     /// </summary>
-    public class GenericTcpServerClientReadyForcommunicationsEventArgs : EventArgs
+    /// <param name="isReady"></param>
+    public GenericTcpServerClientReadyForcommunicationsEventArgs(bool isReady)
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        public bool IsReady;
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="isReady"></param>
-        public GenericTcpServerClientReadyForcommunicationsEventArgs(bool isReady)
-        {
-            IsReady = isReady;
-        }
+        IsReady = isReady;
+    }
 		/// <summary>
 		/// S+ Constructor
 		/// </summary>
 		public GenericTcpServerClientReadyForcommunicationsEventArgs() { }
+}
+
+/// <summary>
+/// EventArgs for UDP connected
+/// </summary>
+public class GenericUdpConnectedEventArgs : EventArgs
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public ushort UConnected;
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool Connected;
+
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    public GenericUdpConnectedEventArgs() { }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="uconnected"></param>
+    public GenericUdpConnectedEventArgs(ushort uconnected)
+    {
+        UConnected = uconnected;
     }
 
     /// <summary>
-    /// EventArgs for UDP connected
+    /// 
     /// </summary>
-    public class GenericUdpConnectedEventArgs : EventArgs
+    /// <param name="connected"></param>
+    public GenericUdpConnectedEventArgs(bool connected)
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        public ushort UConnected;
-        /// <summary>
-        /// 
-        /// </summary>
-        public bool Connected;
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        public GenericUdpConnectedEventArgs() { }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="uconnected"></param>
-        public GenericUdpConnectedEventArgs(ushort uconnected)
-        {
-            UConnected = uconnected;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="connected"></param>
-        public GenericUdpConnectedEventArgs(bool connected)
-        {
-            Connected = connected;
-        }
-
+        Connected = connected;
     }
 
-   
+}
 
-}

src/PepperDash.Core/Comm/GenericSshClient.cs

@@ -8,145 +8,145 @@ using PepperDash.Core.Logging;
 using Renci.SshNet;
 using Renci.SshNet.Common;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// 
+/// </summary>
+public class GenericSshClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
 {
+    private const string SPlusKey = "Uninitialized SshClient";
+    /// <summary>
+    /// Object to enable stream debugging
+    /// </summary>
+    public CommunicationStreamDebugging StreamDebugging { get; private set; }
+
+    /// <summary>
+    /// Event that fires when data is received.  Delivers args with byte array
+    /// </summary>
+    public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+
+    /// <summary>
+    /// Event that fires when data is received.  Delivered as text.
+    /// </summary>
+    public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+
+    /// <summary>
+    /// Event when the connection status changes.
+    /// </summary>
+    public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+
+    ///// <summary>
+    ///// 
+    ///// </summary>
+    //public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
+
+    /// <summary>
+    /// Address of server
+    /// </summary>
+    public string Hostname { get; set; }
+
+    /// <summary>
+    /// Port on server
+    /// </summary>
+    public int Port { get; set; }
+
+    /// <summary>
+    /// Username for server
+    /// </summary>
+    public string Username { get; set; }
+
+    /// <summary>
+    /// And... Password for server.  That was worth documenting!
+    /// </summary>
+    public string Password { get; set; }
+
+    /// <summary>
+    /// True when the server is connected - when status == 2.
+    /// </summary>
+    public bool IsConnected
+    {
+        // returns false if no client or not connected
+        get { return Client != null && ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+    }
+
+    /// <summary>
+    /// S+ helper for IsConnected
+    /// </summary>
+    public ushort UIsConnected
+    {
+        get { return (ushort)(IsConnected ? 1 : 0); }
+    }
+
     /// <summary>
     /// 
     /// </summary>
-    public class GenericSshClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
+    public SocketStatus ClientStatus
     {
-        private const string SPlusKey = "Uninitialized SshClient";
-        /// <summary>
-        /// Object to enable stream debugging
-        /// </summary>
-        public CommunicationStreamDebugging StreamDebugging { get; private set; }
-
-        /// <summary>
-        /// Event that fires when data is received.  Delivers args with byte array
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
-
-        /// <summary>
-        /// Event that fires when data is received.  Delivered as text.
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
-
-        /// <summary>
-        /// Event when the connection status changes.
-        /// </summary>
-        public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
-
-        ///// <summary>
-        ///// 
-        ///// </summary>
-        //public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
-
-        /// <summary>
-        /// Address of server
-        /// </summary>
-        public string Hostname { get; set; }
-
-        /// <summary>
-        /// Port on server
-        /// </summary>
-        public int Port { get; set; }
-
-        /// <summary>
-        /// Username for server
-        /// </summary>
-        public string Username { get; set; }
-
-        /// <summary>
-        /// And... Password for server.  That was worth documenting!
-        /// </summary>
-        public string Password { get; set; }
-
-        /// <summary>
-        /// True when the server is connected - when status == 2.
-        /// </summary>
-        public bool IsConnected
+        get { return _ClientStatus; }
+        private set
         {
-            // returns false if no client or not connected
-            get { return Client != null && ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
+            if (_ClientStatus == value)
+                return;
+            _ClientStatus = value;
+            OnConnectionChange();
         }
+    }
+    SocketStatus _ClientStatus;
 
-        /// <summary>
-        /// S+ helper for IsConnected
-        /// </summary>
-        public ushort UIsConnected
-        {
-            get { return (ushort)(IsConnected ? 1 : 0); }
-        }
+    /// <summary>
+    /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
+    /// and IsConnected with be true when this == 2.
+    /// </summary>
+    public ushort UStatus
+    {
+        get { return (ushort)_ClientStatus; }
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public SocketStatus ClientStatus
-        {
-            get { return _ClientStatus; }
-            private set
-            {
-                if (_ClientStatus == value)
-                    return;
-                _ClientStatus = value;
-                OnConnectionChange();
-            }
-        }
-        SocketStatus _ClientStatus;
+    /// <summary>
+    /// Determines whether client will attempt reconnection on failure. Default is true
+    /// </summary>
+    public bool AutoReconnect { get; set; }
 
-        /// <summary>
-        /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
-        /// and IsConnected with be true when this == 2.
-        /// </summary>
-        public ushort UStatus
-        {
-            get { return (ushort)_ClientStatus; }
-        }
+    /// <summary>
+    /// Will be set and unset by connect and disconnect only
+    /// </summary>
+    public bool ConnectEnabled { get; private set; }
 
-        /// <summary>
-        /// Determines whether client will attempt reconnection on failure. Default is true
-        /// </summary>
-        public bool AutoReconnect { get; set; }
+    /// <summary>
+    /// S+ helper for AutoReconnect
+    /// </summary>
+    public ushort UAutoReconnect
+    {
+        get { return (ushort)(AutoReconnect ? 1 : 0); }
+        set { AutoReconnect = value == 1; }
+    }
 
-        /// <summary>
-        /// Will be set and unset by connect and disconnect only
-        /// </summary>
-        public bool ConnectEnabled { get; private set; }
+    /// <summary>
+    /// Millisecond value, determines the timeout period in between reconnect attempts.
+    /// Set to 5000 by default
+    /// </summary>
+    public int AutoReconnectIntervalMs { get; set; }
 
-        /// <summary>
-        /// S+ helper for AutoReconnect
-        /// </summary>
-        public ushort UAutoReconnect
-        {
-            get { return (ushort)(AutoReconnect ? 1 : 0); }
-            set { AutoReconnect = value == 1; }
-        }
+    SshClient Client;
 
-        /// <summary>
-        /// Millisecond value, determines the timeout period in between reconnect attempts.
-        /// Set to 5000 by default
-        /// </summary>
-        public int AutoReconnectIntervalMs { get; set; }
+    ShellStream TheStream;
 
-        SshClient Client;
+    CTimer ReconnectTimer;
 
-        ShellStream TheStream;
+    //Lock object to prevent simulatneous connect/disconnect operations
+    //private CCriticalSection connectLock = new CCriticalSection();
+    private SemaphoreSlim connectLock = new SemaphoreSlim(1);
 
-        CTimer ReconnectTimer;
+    private bool DisconnectLogged = false;
 
-        //Lock object to prevent simulatneous connect/disconnect operations
-        //private CCriticalSection connectLock = new CCriticalSection();
-        private SemaphoreSlim connectLock = new SemaphoreSlim(1);
-
-        private bool DisconnectLogged = false;
-
-        /// <summary>
-        /// Typical constructor.
-        /// </summary>
-        public GenericSshClient(string key, string hostname, int port, string username, string password) :
-            base(key)
-        {
-            StreamDebugging = new CommunicationStreamDebugging(key);
+    /// <summary>
+    /// Typical constructor.
+    /// </summary>
+    public GenericSshClient(string key, string hostname, int port, string username, string password) :
+        base(key)
+    {
+        StreamDebugging = new CommunicationStreamDebugging(key);
 			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
 			Key = key;
 			Hostname = hostname;
@@ -155,12 +155,12 @@ namespace PepperDash.Core
 			Password = password; 
 			AutoReconnectIntervalMs = 5000;
 
-            ReconnectTimer = new CTimer(o =>
+        ReconnectTimer = new CTimer(o =>
 	            {
-                    if (ConnectEnabled)
-                    {
-                        Connect();
-                    }
+                if (ConnectEnabled)
+                {
+                    Connect();
+                }
 	            }, System.Threading.Timeout.Infinite);
 		}
 
@@ -173,13 +173,13 @@ namespace PepperDash.Core
 			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
 			AutoReconnectIntervalMs = 5000;
 
-            ReconnectTimer = new CTimer(o =>
+        ReconnectTimer = new CTimer(o =>
+        {
+            if (ConnectEnabled)
             {
-                if (ConnectEnabled)
-                {
-                    Connect();
-                }
-            }, System.Threading.Timeout.Infinite);
+                Connect();
+            }
+        }, System.Threading.Timeout.Infinite);
 		}
 
 		/// <summary>
@@ -192,137 +192,137 @@ namespace PepperDash.Core
 				if (Client != null)
 				{
 					this.LogDebug("Program stopping. Closing connection");
-                    Disconnect();
-                }
+                Disconnect();
             }
         }
+    }
 
-        /// <summary>
-        /// Connect to the server, using the provided properties.
-        /// </summary>
-        public void Connect()
+    /// <summary>
+    /// Connect to the server, using the provided properties.
+    /// </summary>
+    public void Connect()
+    {
+        // Don't go unless everything is here
+        if (string.IsNullOrEmpty(Hostname) || Port < 1 || Port > 65535
+            || Username == null || Password == null)
         {
-            // Don't go unless everything is here
-            if (string.IsNullOrEmpty(Hostname) || Port < 1 || Port > 65535
-                || Username == null || Password == null)
+            this.LogError("Connect failed.  Check hostname, port, username and password are set or not null");
+            return;
+        }
+
+        ConnectEnabled = true;
+
+        try
+        {
+            connectLock.Wait();
+            if (IsConnected)
             {
-                this.LogError("Connect failed.  Check hostname, port, username and password are set or not null");
-                return;
+                this.LogDebug("Connection already connected.  Exiting Connect");
             }
-
-            ConnectEnabled = true;
-
-            try
+            else
             {
-                connectLock.Wait();
-                if (IsConnected)
-                {
-                    this.LogDebug("Connection already connected.  Exiting Connect");
-                }
-                else
-                {
-                    this.LogDebug("Attempting connect");
+                this.LogDebug("Attempting connect");
 
-                    // Cancel reconnect if running.
+                // Cancel reconnect if running.
 					if (ReconnectTimer != null)
 					{
 						ReconnectTimer.Stop();
 					}
 
-                    // Cleanup the old client if it already exists
-                    if (Client != null)
+                // Cleanup the old client if it already exists
+                if (Client != null)
+                {
+                    this.LogDebug("Cleaning up disconnected client");
+                    KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
+                }
+
+                // This handles both password and keyboard-interactive (like on OS-X, 'nixes)
+                KeyboardInteractiveAuthenticationMethod kauth = new KeyboardInteractiveAuthenticationMethod(Username);
+                kauth.AuthenticationPrompt += new EventHandler<AuthenticationPromptEventArgs>(kauth_AuthenticationPrompt);
+                PasswordAuthenticationMethod pauth = new PasswordAuthenticationMethod(Username, Password);
+
+                this.LogDebug("Creating new SshClient");
+                ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
+                Client = new SshClient(connectionInfo);
+                Client.ErrorOccurred += Client_ErrorOccurred;
+
+                //Attempt to connect
+                ClientStatus = SocketStatus.SOCKET_STATUS_WAITING;
+                try
+                {
+                    Client.Connect();
+                    TheStream = Client.CreateShellStream("PDTShell", 0, 0, 0, 0, 65534);
+                    if (TheStream.DataAvailable)
                     {
-                        this.LogDebug("Cleaning up disconnected client");
-                        KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
+                        // empty the buffer if there is data
+                        string str = TheStream.Read();
+                    }
+                    TheStream.DataReceived += Stream_DataReceived;
+                    this.LogInformation("Connected");
+                    ClientStatus = SocketStatus.SOCKET_STATUS_CONNECTED;
+                    DisconnectLogged = false;
+                }
+                catch (SshConnectionException e)
+                {
+                    var ie = e.InnerException; // The details are inside!!
+                    var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
+
+                    if (ie is SocketException)
+                    {
+                        this.LogException(ie, "CONNECTION failure: Cannot reach host");                            
                     }
 
-                    // This handles both password and keyboard-interactive (like on OS-X, 'nixes)
-                    KeyboardInteractiveAuthenticationMethod kauth = new KeyboardInteractiveAuthenticationMethod(Username);
-                    kauth.AuthenticationPrompt += new EventHandler<AuthenticationPromptEventArgs>(kauth_AuthenticationPrompt);
-                    PasswordAuthenticationMethod pauth = new PasswordAuthenticationMethod(Username, Password);
-
-                    this.LogDebug("Creating new SshClient");
-                    ConnectionInfo connectionInfo = new ConnectionInfo(Hostname, Port, Username, pauth, kauth);
-                    Client = new SshClient(connectionInfo);
-                    Client.ErrorOccurred += Client_ErrorOccurred;
-
-                    //Attempt to connect
-                    ClientStatus = SocketStatus.SOCKET_STATUS_WAITING;
-                    try
+                    if (ie is System.Net.Sockets.SocketException socketException)
                     {
-                        Client.Connect();
-                        TheStream = Client.CreateShellStream("PDTShell", 0, 0, 0, 0, 65534);
-                        if (TheStream.DataAvailable)
-                        {
-                            // empty the buffer if there is data
-                            string str = TheStream.Read();
-                        }
-                        TheStream.DataReceived += Stream_DataReceived;
-                        this.LogInformation("Connected");
-                        ClientStatus = SocketStatus.SOCKET_STATUS_CONNECTED;
-                        DisconnectLogged = false;
+                        this.LogException(ie, "Connection failure: Cannot reach {host} on {port}",
+                            Hostname, Port);
                     }
-                    catch (SshConnectionException e)
+                    if (ie is SshAuthenticationException)
                     {
-                        var ie = e.InnerException; // The details are inside!!
-                        var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
-
-                        if (ie is SocketException)
-                        {
-                            this.LogException(ie, "CONNECTION failure: Cannot reach host");                            
-                        }
-
-                        if (ie is System.Net.Sockets.SocketException socketException)
-                        {
-                            this.LogException(ie, "Connection failure: Cannot reach {host} on {port}",
-                                Hostname, Port);
-                        }
-                        if (ie is SshAuthenticationException)
-                        {
-                            this.LogException(ie, "Authentication failure for username {userName}", Username);
-                        }
-                        else
-                            this.LogException(ie, "Error on connect");
-
-                        DisconnectLogged = true;
-                        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect)
-                        {
-                            this.LogDebug("Checking autoreconnect: {autoReconnect}, {autoReconnectInterval}ms", AutoReconnect, AutoReconnectIntervalMs);
-                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
-                        }
+                        this.LogException(ie, "Authentication failure for username {userName}", Username);
                     }
-                    catch(SshOperationTimeoutException ex)
-                    {
-                        this.LogWarning("Connection attempt timed out: {message}", ex.Message);
+                    else
+                        this.LogException(ie, "Error on connect");
 
-                        DisconnectLogged = true;
-                        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect)
-                        {
-                            this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
-                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
-                        }
-                    }
-                    catch (Exception e)
+                    DisconnectLogged = true;
+                    KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                    if (AutoReconnect)
                     {
-                        var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
-                        this.LogException(e, "Unhandled exception on connect");
-                        DisconnectLogged = true;
-                        KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                        if (AutoReconnect)
-                        {
-                            this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
-                            ReconnectTimer.Reset(AutoReconnectIntervalMs);
-                        }
+                        this.LogDebug("Checking autoreconnect: {autoReconnect}, {autoReconnectInterval}ms", AutoReconnect, AutoReconnectIntervalMs);
+                        ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                    }
+                }
+                catch(SshOperationTimeoutException ex)
+                {
+                    this.LogWarning("Connection attempt timed out: {message}", ex.Message);
+
+                    DisconnectLogged = true;
+                    KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                    if (AutoReconnect)
+                    {
+                        this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
+                        ReconnectTimer.Reset(AutoReconnectIntervalMs);
+                    }
+                }
+                catch (Exception e)
+                {
+                    var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
+                    this.LogException(e, "Unhandled exception on connect");
+                    DisconnectLogged = true;
+                    KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+                    if (AutoReconnect)
+                    {
+                        this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
+                        ReconnectTimer.Reset(AutoReconnectIntervalMs);
                     }
                 }
             }
-            finally
-            {
-                connectLock.Release();
-            }
         }
+        finally
+        {
+            connectLock.Release();
+        }
+    }
 
 		/// <summary>
 		/// Disconnect the clients and put away it's resources.
@@ -337,54 +337,54 @@ namespace PepperDash.Core
 				// ReconnectTimer = null;
 			}
 
-            KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
-        }
+        KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
+    }
 
-        /// <summary>
-        /// Kills the stream, cleans up the client and sets it to null
-        /// </summary>
-        private void KillClient(SocketStatus status)
+    /// <summary>
+    /// Kills the stream, cleans up the client and sets it to null
+    /// </summary>
+    private void KillClient(SocketStatus status)
+    {
+        KillStream();
+
+        try
         {
-            KillStream();
-
-            try
+            if (Client != null)
             {
-                if (Client != null)
-                {
-                    Client.ErrorOccurred -= Client_ErrorOccurred;
-                    Client.Disconnect();
-                    Client.Dispose();
-                    Client = null;
-                    ClientStatus = status;
-                    this.LogDebug("Disconnected");
-                }
-            }
-            catch (Exception ex)
-            {
-               this.LogException(ex,"Exception in Kill Client");
+                Client.ErrorOccurred -= Client_ErrorOccurred;
+                Client.Disconnect();
+                Client.Dispose();
+                Client = null;
+                ClientStatus = status;
+                this.LogDebug("Disconnected");
             }
         }
+        catch (Exception ex)
+        {
+           this.LogException(ex,"Exception in Kill Client");
+        }
+    }
 
-        /// <summary>
-        /// Kills the stream
-        /// </summary>
+    /// <summary>
+    /// Kills the stream
+    /// </summary>
 		void KillStream()
 		{
-            try
+        try
+        {
+            if (TheStream != null)
             {
-                if (TheStream != null)
-                {
-                    TheStream.DataReceived -= Stream_DataReceived;
-                    TheStream.Close();
-                    TheStream.Dispose();
-                    TheStream = null;
-                    this.LogDebug("Disconnected stream");
-                }
-            }
-            catch (Exception ex)
-            {
-                this.LogException(ex, "Exception in Kill Stream:{0}");
+                TheStream.DataReceived -= Stream_DataReceived;
+                TheStream.Close();
+                TheStream.Dispose();
+                TheStream = null;
+                this.LogDebug("Disconnected stream");
             }
+        }
+        catch (Exception ex)
+        {
+            this.LogException(ex, "Exception in Kill Stream:{0}");
+        }
 		}
 
 		/// <summary>
@@ -402,32 +402,32 @@ namespace PepperDash.Core
 		/// </summary>
 		void Stream_DataReceived(object sender, ShellDataEventArgs e)
 		{
-            if (((ShellStream)sender).Length <= 0L)
-            {
-                return;
-            }
-            var response = ((ShellStream)sender).Read(); 
- 
+        if (((ShellStream)sender).Length <= 0L)
+        {
+            return;
+        }
+        var response = ((ShellStream)sender).Read(); 
+
 			var bytesHandler = BytesReceived;
-            
+        
 		    if (bytesHandler != null)
 		    {
-                var bytes = Encoding.UTF8.GetBytes(response);
+            var bytes = Encoding.UTF8.GetBytes(response);
 		        if (StreamDebugging.RxStreamDebuggingIsEnabled)
 		        {
 		            this.LogInformation("Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
 		        }
-                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+            bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
 		    }
 				
 			var textHandler = TextReceived;
 			if (textHandler != null)
 			{
-                if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                    this.LogInformation("Received: '{0}'", ComTextHelper.GetDebugText(response));
+            if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                this.LogInformation("Received: '{0}'", ComTextHelper.GetDebugText(response));
 
-                textHandler(this, new GenericCommMethodReceiveTextArgs(response));
-            }
+            textHandler(this, new GenericCommMethodReceiveTextArgs(response));
+        }
 			
 		}
 
@@ -438,39 +438,39 @@ namespace PepperDash.Core
 		/// </summary>
 		void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
 		{
-            CrestronInvoke.BeginInvoke(o =>
-            {
-                if (e.Exception is SshConnectionException || e.Exception is System.Net.Sockets.SocketException)
-                    this.LogError("Disconnected by remote");
-                else
-                    this.LogException(e.Exception, "Unhandled SSH client error");
-                try
-                {
-                    connectLock.Wait();
-                    KillClient(SocketStatus.SOCKET_STATUS_BROKEN_REMOTELY);
-                }
-                finally
-                {
-                    connectLock.Release();
-                }
-                if (AutoReconnect && ConnectEnabled)
-                {
-                    this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
-                    ReconnectTimer.Reset(AutoReconnectIntervalMs);
-                }
-            });
-        }
-
-        /// <summary>
-        /// Helper for ConnectionChange event
-        /// </summary>
-        void OnConnectionChange()
+        CrestronInvoke.BeginInvoke(o =>
         {
-            if (ConnectionChange != null)
-                ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
-        }
+            if (e.Exception is SshConnectionException || e.Exception is System.Net.Sockets.SocketException)
+                this.LogError("Disconnected by remote");
+            else
+                this.LogException(e.Exception, "Unhandled SSH client error");
+            try
+            {
+                connectLock.Wait();
+                KillClient(SocketStatus.SOCKET_STATUS_BROKEN_REMOTELY);
+            }
+            finally
+            {
+                connectLock.Release();
+            }
+            if (AutoReconnect && ConnectEnabled)
+            {
+                this.LogDebug("Checking autoreconnect: {0}, {1}ms", AutoReconnect, AutoReconnectIntervalMs);
+                ReconnectTimer.Reset(AutoReconnectIntervalMs);
+            }
+        });
+    }
 
-        #region IBasicCommunication Members
+    /// <summary>
+    /// Helper for ConnectionChange event
+    /// </summary>
+    void OnConnectionChange()
+    {
+        if (ConnectionChange != null)
+            ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
+    }
+
+    #region IBasicCommunication Members
 
 		/// <summary>
 		/// Sends text to the server
@@ -497,52 +497,52 @@ namespace PepperDash.Core
 		        }
 		    }
 		    catch (ObjectDisposedException)
-            {
-                this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());                
+        {
+            this.LogError("ObjectDisposedException sending '{message}'. Restarting connection...", text.Trim());                
 
-                KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                ReconnectTimer.Reset();
+            KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+            ReconnectTimer.Reset();
 		    }
 			catch (Exception ex)
 			{
-                this.LogException(ex, "Exception sending text: '{message}'", text);
+            this.LogException(ex, "Exception sending text: '{message}'", text);
 			}
 		}
 
-        /// <summary>
-        /// Sends Bytes to the server
-        /// </summary>
-        /// <param name="bytes"></param>
+    /// <summary>
+    /// Sends Bytes to the server
+    /// </summary>
+    /// <param name="bytes"></param>
 		public void SendBytes(byte[] bytes)
 		{
-            try
+        try
+        {
+            if (Client != null && TheStream != null && IsConnected)
             {
-                if (Client != null && TheStream != null && IsConnected)
-                {
-                    if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                        this.LogInformation("Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+                if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                    this.LogInformation("Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
 
-                    TheStream.Write(bytes, 0, bytes.Length);
-                    TheStream.Flush();
-                }
-                else
-                {
-                    this.LogDebug("Client is null or disconnected.  Cannot Send Bytes");
-                }
+                TheStream.Write(bytes, 0, bytes.Length);
+                TheStream.Flush();
             }
-            catch (ObjectDisposedException ex)
+            else
             {
-                this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));
+                this.LogDebug("Client is null or disconnected.  Cannot Send Bytes");
+            }
+        }
+        catch (ObjectDisposedException ex)
+        {
+            this.LogException(ex, "ObjectDisposedException sending {message}", ComTextHelper.GetEscapedText(bytes));
 
-                KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
-                ReconnectTimer.Reset();
-            }
-            catch (Exception ex)
-            {
-                this.LogException(ex, "Exception sending {message}", ComTextHelper.GetEscapedText(bytes));
-            }           
+            KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
+            ReconnectTimer.Reset();
+        }
+        catch (Exception ex)
+        {
+            this.LogException(ex, "Exception sending {message}", ComTextHelper.GetEscapedText(bytes));
+        }           
 		}
-    #endregion
+#endregion
 
 }
 
@@ -553,40 +553,39 @@ namespace PepperDash.Core
 /// </summary>
 public class SshConnectionChangeEventArgs : EventArgs
 	{
-        /// <summary>
-        /// Connection State
-        /// </summary>
+    /// <summary>
+    /// Connection State
+    /// </summary>
 		public bool IsConnected { get; private set; }
 
-        /// <summary>
-        /// Connection Status represented as a ushort
-        /// </summary>
+    /// <summary>
+    /// Connection Status represented as a ushort
+    /// </summary>
 		public ushort UIsConnected { get { return (ushort)(Client.IsConnected ? 1 : 0); } }
 
-        /// <summary>
-        /// The client
-        /// </summary>
+    /// <summary>
+    /// The client
+    /// </summary>
 		public GenericSshClient Client { get; private set; }
 
-        /// <summary>
-        /// Socket Status as represented by
-        /// </summary>
+    /// <summary>
+    /// Socket Status as represented by
+    /// </summary>
 		public ushort Status { get { return Client.UStatus; } }
 
-        /// <summary>
-        ///  S+ Constructor
-        /// </summary>
-        public SshConnectionChangeEventArgs() { }
+    /// <summary>
+    ///  S+ Constructor
+    /// </summary>
+    public SshConnectionChangeEventArgs() { }
 
-        /// <summary>
-        /// EventArgs class
-        /// </summary>
-        /// <param name="isConnected">Connection State</param>
-        /// <param name="client">The Client</param>
+    /// <summary>
+    /// EventArgs class
+    /// </summary>
+    /// <param name="isConnected">Connection State</param>
+    /// <param name="client">The Client</param>
 		public SshConnectionChangeEventArgs(bool isConnected, GenericSshClient client)
-        {
-            IsConnected = isConnected;
-            Client = client;
-        }
+    {
+        IsConnected = isConnected;
+        Client = client;
     }
 }

src/PepperDash.Core/Comm/GenericTcpIpClient.cs

@@ -6,18 +6,18 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronSockets;
 using Newtonsoft.Json;
 
-namespace PepperDash.Core
-{
-    /// <summary>
-    /// A class to handle basic TCP/IP communications with a server
-    /// </summary>
+namespace PepperDash.Core;
+
+/// <summary>
+/// A class to handle basic TCP/IP communications with a server
+/// </summary>
 	public class GenericTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
-    {
-        private const string SplusKey = "Uninitialized TcpIpClient";
-        /// <summary>
-        /// Object to enable stream debugging
-        /// </summary>
-        public CommunicationStreamDebugging StreamDebugging { get; private set; }
+{
+    private const string SplusKey = "Uninitialized TcpIpClient";
+    /// <summary>
+    /// Object to enable stream debugging
+    /// </summary>
+    public CommunicationStreamDebugging StreamDebugging { get; private set; }
 
 		/// <summary>
 		/// Fires when data is received from the server and returns it as a Byte array
@@ -38,11 +38,11 @@ namespace PepperDash.Core
 
 		private string _hostname;
 
-        /// <summary>
-        /// Address of server
-        /// </summary>
-        public string Hostname
-        {
+    /// <summary>
+    /// Address of server
+    /// </summary>
+    public string Hostname
+    {
 			get
 			{
 				return _hostname;
@@ -58,25 +58,25 @@ namespace PepperDash.Core
 			}
 		}
 
-        /// <summary>
-        /// Port on server
-        /// </summary>
-        public int Port { get; set; }
+    /// <summary>
+    /// Port on server
+    /// </summary>
+    public int Port { get; set; }
 
-        /// <summary>
-        /// Another damn S+ helper because S+ seems to treat large port nums as signed ints
-        /// which screws up things
-        /// </summary>
-        public ushort UPort
-        {
-            get { return Convert.ToUInt16(Port); }
-            set { Port = Convert.ToInt32(value); }
-        }
+    /// <summary>
+    /// Another damn S+ helper because S+ seems to treat large port nums as signed ints
+    /// which screws up things
+    /// </summary>
+    public ushort UPort
+    {
+        get { return Convert.ToUInt16(Port); }
+        set { Port = Convert.ToInt32(value); }
+    }
 
-        /// <summary>
-        /// Defaults to 2000
-        /// </summary>
-        public int BufferSize { get; set; }
+    /// <summary>
+    /// Defaults to 2000
+    /// </summary>
+    public int BufferSize { get; set; }
 
 		/// <summary>
 		/// The actual client class
@@ -87,47 +87,47 @@ namespace PepperDash.Core
 		/// Bool showing if socket is connected
 		/// </summary>
 		public bool IsConnected 
-        { 
-            get { return _client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; } 
-        }
-        
-        /// <summary>
-        /// S+ helper for IsConnected
-        /// </summary>
-        public ushort UIsConnected
-        {
-            get { return (ushort)(IsConnected ? 1 : 0); }
-        }
+    { 
+        get { return _client != null && _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; } 
+    }
+    
+    /// <summary>
+    /// S+ helper for IsConnected
+    /// </summary>
+    public ushort UIsConnected
+    {
+        get { return (ushort)(IsConnected ? 1 : 0); }
+    }
 
 		/// <summary>
 		/// _client socket status Read only
 		/// </summary>
 		public SocketStatus ClientStatus 
-        { 
-            get 
-            {
-                return _client == null ? SocketStatus.SOCKET_STATUS_NO_CONNECT : _client.ClientStatus; 
-            } 
-        }
-
-        /// <summary>
-        /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
-        /// and IsConnected would be true when this == 2.
-        /// </summary>
-        public ushort UStatus
+    { 
+        get 
         {
-            get { return (ushort)ClientStatus; }
-        }
+            return _client == null ? SocketStatus.SOCKET_STATUS_NO_CONNECT : _client.ClientStatus; 
+        } 
+    }
+
+    /// <summary>
+    /// Contains the familiar Simpl analog status values. This drives the ConnectionChange event
+    /// and IsConnected would be true when this == 2.
+    /// </summary>
+    public ushort UStatus
+    {
+        get { return (ushort)ClientStatus; }
+    }
 
 		/// <summary>
-        /// Status text shows the message associated with socket status
+    /// Status text shows the message associated with socket status
 		/// </summary>
 		public string ClientStatusText { get { return ClientStatus.ToString(); } }
 
 		/// <summary>
 		/// Ushort representation of client status
 		/// </summary>
-        [Obsolete]
+    [Obsolete]
 		public ushort UClientStatus { get { return (ushort)ClientStatus; } }
 
 		/// <summary>
@@ -140,14 +140,14 @@ namespace PepperDash.Core
 		/// </summary>
 		public bool AutoReconnect { get; set; }
 
-        /// <summary>
-        /// S+ helper for AutoReconnect
-        /// </summary>
-        public ushort UAutoReconnect
-        {
-            get { return (ushort)(AutoReconnect ? 1 : 0); }
-            set { AutoReconnect = value == 1; }
-        }
+    /// <summary>
+    /// S+ helper for AutoReconnect
+    /// </summary>
+    public ushort UAutoReconnect
+    {
+        get { return (ushort)(AutoReconnect ? 1 : 0); }
+        set { AutoReconnect = value == 1; }
+    }
 
 		/// <summary>
 		/// Milliseconds to wait before attempting to reconnect. Defaults to 5000
@@ -167,283 +167,283 @@ namespace PepperDash.Core
 			get { return _client.ClientStatus == SocketStatus.SOCKET_STATUS_CONNECTED; }
 		}
 
-        //Lock object to prevent simulatneous connect/disconnect operations
-        private CCriticalSection connectLock = new CCriticalSection();
+    //Lock object to prevent simulatneous connect/disconnect operations
+    private CCriticalSection connectLock = new CCriticalSection();
 
-        // private Timer for auto reconnect
+    // private Timer for auto reconnect
 		private CTimer RetryTimer;
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key">unique string to differentiate between instances</param>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        /// <param name="bufferSize"></param>
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    /// <param name="key">unique string to differentiate between instances</param>
+    /// <param name="address"></param>
+    /// <param name="port"></param>
+    /// <param name="bufferSize"></param>
 		public GenericTcpIpClient(string key, string address, int port, int bufferSize)
 			: base(key)
 		{
-            StreamDebugging = new CommunicationStreamDebugging(key);
-            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
-            AutoReconnectIntervalMs = 5000;
-            Hostname = address;
-            Port = port;
-            BufferSize = bufferSize;
+        StreamDebugging = new CommunicationStreamDebugging(key);
+        CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+        AutoReconnectIntervalMs = 5000;
+        Hostname = address;
+        Port = port;
+        BufferSize = bufferSize;
 
-            RetryTimer = new CTimer(o =>
-            {
-                Reconnect();
-            }, Timeout.Infinite);
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="key"></param>
-        public GenericTcpIpClient(string key)
-            : base(key)
+        RetryTimer = new CTimer(o =>
         {
-            StreamDebugging = new CommunicationStreamDebugging(key);
-            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
-            AutoReconnectIntervalMs = 5000;
-            BufferSize = 2000;
+            Reconnect();
+        }, Timeout.Infinite);
+    }
 
-            RetryTimer = new CTimer(o =>
-            {
-                Reconnect();
-            }, Timeout.Infinite);
-        }
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    /// <param name="key"></param>
+    public GenericTcpIpClient(string key)
+        : base(key)
+    {
+        StreamDebugging = new CommunicationStreamDebugging(key);
+        CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+        AutoReconnectIntervalMs = 5000;
+        BufferSize = 2000;
 
-        /// <summary>
-        /// Default constructor for S+
-        /// </summary>
-        public GenericTcpIpClient()
+        RetryTimer = new CTimer(o =>
+        {
+            Reconnect();
+        }, Timeout.Infinite);
+    }
+
+    /// <summary>
+    /// Default constructor for S+
+    /// </summary>
+    public GenericTcpIpClient()
 			: base(SplusKey)
-        {
-            StreamDebugging = new CommunicationStreamDebugging(SplusKey);
+    {
+        StreamDebugging = new CommunicationStreamDebugging(SplusKey);
 			CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
 			AutoReconnectIntervalMs = 5000;
-            BufferSize = 2000;
+        BufferSize = 2000;
 
-            RetryTimer = new CTimer(o =>
-            {
-                Reconnect();
-            }, Timeout.Infinite);
+        RetryTimer = new CTimer(o =>
+        {
+            Reconnect();
+        }, Timeout.Infinite);
 		}
 
-        /// <summary>
-        /// Just to help S+ set the key
-        /// </summary>
-        public void Initialize(string key)
-        {
-            Key = key;
-        }
+    /// <summary>
+    /// Just to help S+ set the key
+    /// </summary>
+    public void Initialize(string key)
+    {
+        Key = key;
+    }
 
-        /// <summary>
-        /// Handles closing this up when the program shuts down
-        /// </summary>
-        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+    /// <summary>
+    /// Handles closing this up when the program shuts down
+    /// </summary>
+    void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+    {
+        if (programEventType == eProgramStatusEventType.Stopping)
         {
-            if (programEventType == eProgramStatusEventType.Stopping)
-            {
-                Debug.Console(1, this, "Program stopping. Closing connection");
-                Deactivate();
-            }
+            Debug.Console(1, this, "Program stopping. Closing connection");
+            Deactivate();
         }
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
 		public override bool Deactivate()
 		{
-            RetryTimer.Stop();
-            RetryTimer.Dispose();
-            if (_client != null)
-            {
-             _client.SocketStatusChange -= this.Client_SocketStatusChange;
-                DisconnectClient();
-            }
+        RetryTimer.Stop();
+        RetryTimer.Dispose();
+        if (_client != null)
+        {
+         _client.SocketStatusChange -= this.Client_SocketStatusChange;
+            DisconnectClient();
+        }
 			return true;
 		}
 
-        /// <summary>
-        /// Attempts to connect to the server
-        /// </summary>
+    /// <summary>
+    /// Attempts to connect to the server
+    /// </summary>
 		public void Connect()
 		{
-            if (string.IsNullOrEmpty(Hostname))
-            {
-                Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericTcpIpClient '{0}': No address set", Key);
-                return;
-            }
-            if (Port < 1 || Port > 65535)
-            {
-                {
-                    Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericTcpIpClient '{0}': Invalid port", Key);
-                    return;
-                }
-            }
-
-            try
-            {
-                connectLock.Enter();
-                if (IsConnected)
-                {
-                    Debug.Console(1, this, "Connection already connected. Exiting Connect()");
-                }
-                else
-                {
-                    //Stop retry timer if running
-                    RetryTimer.Stop();
-                    _client = new TCPClient(Hostname, Port, BufferSize);
-                    _client.SocketStatusChange -= Client_SocketStatusChange;
-                    _client.SocketStatusChange += Client_SocketStatusChange;
-                    DisconnectCalledByUser = false;
-                    _client.ConnectToServerAsync(ConnectToServerCallback);
-                }
-            }
-            finally
-            {
-                connectLock.Leave();
-            }
-		}
-
-        private void Reconnect()
+        if (string.IsNullOrEmpty(Hostname))
+        {
+            Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericTcpIpClient '{0}': No address set", Key);
+            return;
+        }
+        if (Port < 1 || Port > 65535)
         {
-            if (_client == null)
             {
+                Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericTcpIpClient '{0}': Invalid port", Key);
                 return;
             }
-            try
-            {
-                connectLock.Enter();
-                if (IsConnected || DisconnectCalledByUser == true)
-                {
-                    Debug.Console(1, this, "Reconnect no longer needed. Exiting Reconnect()");
-                }
-                else
-                {
-                    Debug.Console(1, this, "Attempting reconnect now");
-                    _client.ConnectToServerAsync(ConnectToServerCallback);
-                }
-            }
-            finally
-            {
-                connectLock.Leave();
-            }
         }
 
-        /// <summary>
-        /// Attempts to disconnect the client
-        /// </summary>
-		public void Disconnect()
-		{
-            try
-            {
-                connectLock.Enter();
-                DisconnectCalledByUser = true;
-
-                // Stop trying reconnects, if we are
-                RetryTimer.Stop();
-                DisconnectClient();
-            }
-            finally
-            {
-                connectLock.Leave();
-            }
-		}
-
-        /// <summary>
-        /// Does the actual disconnect business
-        /// </summary>
-        public void DisconnectClient()
+        try
         {
-            if (_client != null)
+            connectLock.Enter();
+            if (IsConnected)
             {
-                Debug.Console(1, this, "Disconnecting client");
-                if (IsConnected)
-                    _client.DisconnectFromServer();
-            }
-        }
-
-        /// <summary>
-        /// Callback method for connection attempt
-        /// </summary>
-        /// <param name="c"></param>
-		void ConnectToServerCallback(TCPClient c)
-		{
-            if (c.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
-            {
-                Debug.Console(0, this, "Server connection result: {0}", c.ClientStatus);
-                WaitAndTryReconnect();
+                Debug.Console(1, this, "Connection already connected. Exiting Connect()");
             }
             else
             {
-                Debug.Console(1, this, "Server connection result: {0}", c.ClientStatus);
+                //Stop retry timer if running
+                RetryTimer.Stop();
+                _client = new TCPClient(Hostname, Port, BufferSize);
+                _client.SocketStatusChange -= Client_SocketStatusChange;
+                _client.SocketStatusChange += Client_SocketStatusChange;
+                DisconnectCalledByUser = false;
+                _client.ConnectToServerAsync(ConnectToServerCallback);
             }
+        }
+        finally
+        {
+            connectLock.Leave();
+        }
 		}
 
-        /// <summary>
-        /// Disconnects, waits and attemtps to connect again
-        /// </summary>
+    private void Reconnect()
+    {
+        if (_client == null)
+        {
+            return;
+        }
+        try
+        {
+            connectLock.Enter();
+            if (IsConnected || DisconnectCalledByUser == true)
+            {
+                Debug.Console(1, this, "Reconnect no longer needed. Exiting Reconnect()");
+            }
+            else
+            {
+                Debug.Console(1, this, "Attempting reconnect now");
+                _client.ConnectToServerAsync(ConnectToServerCallback);
+            }
+        }
+        finally
+        {
+            connectLock.Leave();
+        }
+    }
+
+    /// <summary>
+    /// Attempts to disconnect the client
+    /// </summary>
+		public void Disconnect()
+		{
+        try
+        {
+            connectLock.Enter();
+            DisconnectCalledByUser = true;
+
+            // Stop trying reconnects, if we are
+            RetryTimer.Stop();
+            DisconnectClient();
+        }
+        finally
+        {
+            connectLock.Leave();
+        }
+		}
+
+    /// <summary>
+    /// Does the actual disconnect business
+    /// </summary>
+    public void DisconnectClient()
+    {
+        if (_client != null)
+        {
+            Debug.Console(1, this, "Disconnecting client");
+            if (IsConnected)
+                _client.DisconnectFromServer();
+        }
+    }
+
+    /// <summary>
+    /// Callback method for connection attempt
+    /// </summary>
+    /// <param name="c"></param>
+		void ConnectToServerCallback(TCPClient c)
+		{
+        if (c.ClientStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
+        {
+            Debug.Console(0, this, "Server connection result: {0}", c.ClientStatus);
+            WaitAndTryReconnect();
+        }
+        else
+        {
+            Debug.Console(1, this, "Server connection result: {0}", c.ClientStatus);
+        }
+		}
+
+    /// <summary>
+    /// Disconnects, waits and attemtps to connect again
+    /// </summary>
 		void WaitAndTryReconnect()
 		{
-            CrestronInvoke.BeginInvoke(o =>
+        CrestronInvoke.BeginInvoke(o =>
+        {
+            try
             {
-                try
+                connectLock.Enter();
+                if (!IsConnected && AutoReconnect && !DisconnectCalledByUser && _client != null)
                 {
-                    connectLock.Enter();
-                    if (!IsConnected && AutoReconnect && !DisconnectCalledByUser && _client != null)
-                    {
-                        DisconnectClient();
-                        Debug.Console(1, this, "Attempting reconnect, status={0}", _client.ClientStatus);
-                        RetryTimer.Reset(AutoReconnectIntervalMs);
-                    }
+                    DisconnectClient();
+                    Debug.Console(1, this, "Attempting reconnect, status={0}", _client.ClientStatus);
+                    RetryTimer.Reset(AutoReconnectIntervalMs);
                 }
-                finally
-                {
-                    connectLock.Leave();
-                }
-            });
+            }
+            finally
+            {
+                connectLock.Leave();
+            }
+        });
 		}
 
-        /// <summary>
-        /// Recieves incoming data
-        /// </summary>
-        /// <param name="client"></param>
-        /// <param name="numBytes"></param>
+    /// <summary>
+    /// Recieves incoming data
+    /// </summary>
+    /// <param name="client"></param>
+    /// <param name="numBytes"></param>
 		void Receive(TCPClient client, int numBytes)
 		{
-            if (client != null)
+        if (client != null)
+        {
+            if (numBytes > 0)
             {
-                if (numBytes > 0)
+                var bytes = client.IncomingDataBuffer.Take(numBytes).ToArray();
+                var bytesHandler = BytesReceived;
+                if (bytesHandler != null)
                 {
-                    var bytes = client.IncomingDataBuffer.Take(numBytes).ToArray();
-                    var bytesHandler = BytesReceived;
-                    if (bytesHandler != null)
+                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
                     {
-                        if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                        {
-                            Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
-                        }
-                        bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+                        Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
                     }
-                    var textHandler = TextReceived;
-                    if (textHandler != null)
-                    {
-                        var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
-
-                        if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                        {
-                            Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
-                        }
-
-                        textHandler(this, new GenericCommMethodReceiveTextArgs(str));
-                    }                    
+                    bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
                 }
-                client.ReceiveDataAsync(Receive);
+                var textHandler = TextReceived;
+                if (textHandler != null)
+                {
+                    var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+
+                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                    {
+                        Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
+                    }
+
+                    textHandler(this, new GenericCommMethodReceiveTextArgs(str));
+                }                    
             }
+            client.ReceiveDataAsync(Receive);
+        }
 		}
 
 		/// <summary>
@@ -453,9 +453,9 @@ namespace PepperDash.Core
 		{
 			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
 			// Check debug level before processing byte array
-            if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
-            if (_client != null)
+        if (StreamDebugging.TxStreamDebuggingIsEnabled)
+            Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
+        if (_client != null)
 			    _client.SendData(bytes, bytes.Length);
 		}
 
@@ -472,35 +472,35 @@ namespace PepperDash.Core
 			SendText(unescapedText);
 		}
 
-        /// <summary>
-        /// Sends Bytes to the server
-        /// </summary>
-        /// <param name="bytes"></param>
+    /// <summary>
+    /// Sends Bytes to the server
+    /// </summary>
+    /// <param name="bytes"></param>
 		public void SendBytes(byte[] bytes)
 		{
-            if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
-            if (_client != null)
+        if (StreamDebugging.TxStreamDebuggingIsEnabled)
+            Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+        if (_client != null)
 			    _client.SendData(bytes, bytes.Length);
 		}
 
-        /// <summary>
-        /// Socket Status Change Handler
-        /// </summary>
-        /// <param name="client"></param>
-        /// <param name="clientSocketStatus"></param>
+    /// <summary>
+    /// Socket Status Change Handler
+    /// </summary>
+    /// <param name="client"></param>
+    /// <param name="clientSocketStatus"></param>
 		void Client_SocketStatusChange(TCPClient client, SocketStatus clientSocketStatus)
 		{
-            if (clientSocketStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
-            {
-                Debug.Console(0, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
-                WaitAndTryReconnect();
-            }
-            else
-            {
-                Debug.Console(1, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
+        if (clientSocketStatus != SocketStatus.SOCKET_STATUS_CONNECTED)
+        {
+            Debug.Console(0, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
+            WaitAndTryReconnect();
+        }
+        else
+        {
+            Debug.Console(1, this, "Socket status change {0} ({1})", clientSocketStatus, ClientStatusText);
 			    _client.ReceiveDataAsync(Receive);
-            }
+        }
 
 			var handler = ConnectionChange;
 			if (handler != null)
@@ -508,30 +508,30 @@ namespace PepperDash.Core
 		}
 	}
 
-    /// <summary>
-    /// Configuration properties for TCP/SSH Connections
-    /// </summary>
+/// <summary>
+/// Configuration properties for TCP/SSH Connections
+/// </summary>
 	public class TcpSshPropertiesConfig
 	{
-        /// <summary>
-        /// Address to connect to
-        /// </summary>
+    /// <summary>
+    /// Address to connect to
+    /// </summary>
 		[JsonProperty(Required = Required.Always)]
 		public string Address { get; set; }
 		
-        /// <summary>
-        /// Port to connect to
-        /// </summary>
+    /// <summary>
+    /// Port to connect to
+    /// </summary>
 		[JsonProperty(Required = Required.Always)]
 		public int Port { get; set; }
 		
-        /// <summary>
-        /// Username credential
-        /// </summary>
+    /// <summary>
+    /// Username credential
+    /// </summary>
 		public string Username { get; set; }
-        /// <summary>
-        /// Passord credential
-        /// </summary>
+    /// <summary>
+    /// Passord credential
+    /// </summary>
 		public string Password { get; set; }
 
 		/// <summary>
@@ -549,18 +549,16 @@ namespace PepperDash.Core
 		/// </summary>
 		public int AutoReconnectIntervalMs { get; set; }
 
-        /// <summary>
-        /// Default constructor
-        /// </summary>
+    /// <summary>
+    /// Default constructor
+    /// </summary>
 		public TcpSshPropertiesConfig()
 		{
 			BufferSize = 32768;
 			AutoReconnect = true;
 			AutoReconnectIntervalMs = 5000;
-            Username = "";
-            Password = "";
+        Username = "";
+        Password = "";
 		}
 
 	}
-
-}

src/PepperDash.Core/Comm/GenericUdpServer.cs

@@ -8,347 +8,347 @@ using Crestron.SimplSharp.CrestronSockets;
 using Newtonsoft.Json;
 using PepperDash.Core.Logging;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Generic UDP Server device
+/// </summary>
+public class GenericUdpServer : Device, ISocketStatusWithStreamDebugging
 {
+    private const string SplusKey = "Uninitialized Udp Server";
     /// <summary>
-    /// Generic UDP Server device
+    /// Object to enable stream debugging
     /// </summary>
-    public class GenericUdpServer : Device, ISocketStatusWithStreamDebugging
-    {
-        private const string SplusKey = "Uninitialized Udp Server";
-        /// <summary>
-        /// Object to enable stream debugging
-        /// </summary>
-        public CommunicationStreamDebugging StreamDebugging { get; private set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+    public CommunicationStreamDebugging StreamDebugging { get; private set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+    /// <summary>
+    /// 
+    /// </summary>
+    public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
-        /// <summary>
-        /// This event will fire when a message is dequeued that includes the source IP and Port info if needed to determine the source of the received data.
-        /// </summary>
+    /// <summary>
+    /// This event will fire when a message is dequeued that includes the source IP and Port info if needed to determine the source of the received data.
+    /// </summary>
 		public event EventHandler<GenericUdpReceiveTextExtraArgs> DataRecievedExtra;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
+    /// <summary>
+    /// 
+    /// </summary>
+    public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public event EventHandler<GenericUdpConnectedEventArgs> UpdateConnectionStatus;
+    /// <summary>
+    /// 
+    /// </summary>
+    public event EventHandler<GenericUdpConnectedEventArgs> UpdateConnectionStatus;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public SocketStatus ClientStatus
+    /// <summary>
+    /// 
+    /// </summary>
+    public SocketStatus ClientStatus
+    {
+        get
         {
-            get
-            {
-                return Server.ServerStatus;
-            }
+            return Server.ServerStatus;
         }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public ushort UStatus
-        {
-            get { return (ushort)Server.ServerStatus; }
-        }
-
-        /// <summary>
-        /// Address of server
-        /// </summary>
-        public string Hostname { get; set; }
-
-
-        /// <summary>
-        /// Port on server
-        /// </summary>
-        public int Port { get; set; }
-
-        /// <summary>
-        /// Another damn S+ helper because S+ seems to treat large port nums as signed ints
-        /// which screws up things
-        /// </summary>
-        public ushort UPort
-        {
-            get { return Convert.ToUInt16(Port); }
-            set { Port = Convert.ToInt32(value); }
-        }
-
-        /// <summary>
-        /// Indicates that the UDP Server is enabled
-        /// </summary>
-        public bool IsConnected
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Numeric value indicating 
-        /// </summary>
-        public ushort UIsConnected
-        {
-            get { return IsConnected ? (ushort)1 : (ushort)0; }
-        }
-
-        /// <summary>
-        /// Defaults to 2000
-        /// </summary>
-        public int BufferSize { get; set; }
-
-        /// <summary>
-        /// The server
-        /// </summary>
-        public UDPServer Server { get; private set; }
-
-        /// <summary>
-        /// Constructor for S+. Make sure to set key, address, port, and buffersize using init method
-        /// </summary>
-        public GenericUdpServer()
-            : base(SplusKey)
-        {
-            StreamDebugging = new CommunicationStreamDebugging(SplusKey);
-            BufferSize = 5000;
-
-            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
-            CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
-        }
-       
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        /// <param name="buffefSize"></param>
-        public GenericUdpServer(string key, string address, int port, int buffefSize)
-            : base(key)
-        {
-            StreamDebugging = new CommunicationStreamDebugging(key); 
-            Hostname = address;
-            Port = port;
-            BufferSize = buffefSize;
-
-            CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
-            CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
-        }
-
-        /// <summary>
-        /// Call from S+ to initialize values
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="address"></param>
-        /// <param name="port"></param>
-        public void Initialize(string key, string address, ushort port)
-        {
-            Key = key;
-            Hostname = address;
-            UPort = port;
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="ethernetEventArgs"></param>
-        void CrestronEnvironment_EthernetEventHandler(EthernetEventArgs ethernetEventArgs)
-        {
-            // Re-enable the server if the link comes back up and the status should be connected
-            if (ethernetEventArgs.EthernetEventType == eEthernetEventType.LinkUp
-                && IsConnected)
-            {
-                Connect();
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="programEventType"></param>
-        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
-        {
-            if (programEventType != eProgramStatusEventType.Stopping) 
-                return;
-
-            Debug.Console(1, this, "Program stopping. Disabling Server");
-            Disconnect();
-        }
-
-        /// <summary>
-        /// Enables the UDP Server
-        /// </summary>
-        public void Connect()
-        {
-            if (Server == null)
-            {
-                Server = new UDPServer();
-            }
-
-            if (string.IsNullOrEmpty(Hostname))
-            {
-                Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericUdpServer '{0}': No address set", Key);
-                return;
-            }
-            if (Port < 1 || Port > 65535)
-            {
-                {
-                    Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericUdpServer '{0}': Invalid port", Key);
-                    return;
-                }
-            }
-
-            var status = Server.EnableUDPServer(Hostname, Port);
-
-            Debug.Console(2, this, "SocketErrorCode: {0}", status);
-            if (status == SocketErrorCodes.SOCKET_OK)
-                IsConnected = true;
-
-            var handler = UpdateConnectionStatus;
-            if (handler != null)
-                handler(this, new GenericUdpConnectedEventArgs(UIsConnected));
-
-            // Start receiving data
-            Server.ReceiveDataAsync(Receive);
-        }
-
-        /// <summary>
-        /// Disabled the UDP Server
-        /// </summary>
-        public void Disconnect()
-        {
-            if(Server != null)
-                Server.DisableUDPServer();
-
-            IsConnected = false;
-
-            var handler = UpdateConnectionStatus;
-            if (handler != null)
-                handler(this, new GenericUdpConnectedEventArgs(UIsConnected));
-        }
-
-
-        /// <summary>
-        /// Recursive method to receive data
-        /// </summary>
-        /// <param name="server"></param>
-        /// <param name="numBytes"></param>
-        void Receive(UDPServer server, int numBytes)
-        {
-            Debug.Console(2, this, "Received {0} bytes", numBytes);
-
-            try
-            {
-                if (numBytes <= 0) 
-                    return;
-
-                var sourceIp = Server.IPAddressLastMessageReceivedFrom;
-                var sourcePort = Server.IPPortLastMessageReceivedFrom;
-                var bytes = server.IncomingDataBuffer.Take(numBytes).ToArray();
-                var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
-
-                var dataRecivedExtra = DataRecievedExtra;
-                if (dataRecivedExtra != null)
-                    dataRecivedExtra(this, new GenericUdpReceiveTextExtraArgs(str, sourceIp, sourcePort, bytes));
-
-                Debug.Console(2, this, "Bytes: {0}", bytes.ToString());
-                var bytesHandler = BytesReceived;
-                if (bytesHandler != null)
-                {
-                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                    {
-                        Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
-                    }
-                    bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
-                }
-                var textHandler = TextReceived;
-                if (textHandler != null)
-                {
-                    if (StreamDebugging.RxStreamDebuggingIsEnabled)
-                        Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
-                    textHandler(this, new GenericCommMethodReceiveTextArgs(str));
-                }
-            }
-            catch (Exception ex)
-            {
-                this.LogException(ex, "GenericUdpServer Receive error");
-            }
-            finally
-            {
-                server.ReceiveDataAsync(Receive);
-            }
-        }
-
-        /// <summary>
-        /// General send method
-        /// </summary>
-        /// <param name="text"></param>
-        public void SendText(string text)
-        {
-            var bytes = Encoding.GetEncoding(28591).GetBytes(text);
-
-            if (IsConnected && Server != null)
-            {
-                if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                    Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
-
-                Server.SendData(bytes, bytes.Length);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="bytes"></param>
-        public void SendBytes(byte[] bytes)
-        {
-            if (StreamDebugging.TxStreamDebuggingIsEnabled)
-                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
-
-            if (IsConnected && Server != null)
-                Server.SendData(bytes, bytes.Length);
-        }
-
     }
 
     /// <summary>
     /// 
     /// </summary>
+    public ushort UStatus
+    {
+        get { return (ushort)Server.ServerStatus; }
+    }
+
+    /// <summary>
+    /// Address of server
+    /// </summary>
+    public string Hostname { get; set; }
+
+
+    /// <summary>
+    /// Port on server
+    /// </summary>
+    public int Port { get; set; }
+
+    /// <summary>
+    /// Another damn S+ helper because S+ seems to treat large port nums as signed ints
+    /// which screws up things
+    /// </summary>
+    public ushort UPort
+    {
+        get { return Convert.ToUInt16(Port); }
+        set { Port = Convert.ToInt32(value); }
+    }
+
+    /// <summary>
+    /// Indicates that the UDP Server is enabled
+    /// </summary>
+    public bool IsConnected
+    {
+        get;
+        private set;
+    }
+
+    /// <summary>
+    /// Numeric value indicating 
+    /// </summary>
+    public ushort UIsConnected
+    {
+        get { return IsConnected ? (ushort)1 : (ushort)0; }
+    }
+
+    /// <summary>
+    /// Defaults to 2000
+    /// </summary>
+    public int BufferSize { get; set; }
+
+    /// <summary>
+    /// The server
+    /// </summary>
+    public UDPServer Server { get; private set; }
+
+    /// <summary>
+    /// Constructor for S+. Make sure to set key, address, port, and buffersize using init method
+    /// </summary>
+    public GenericUdpServer()
+        : base(SplusKey)
+    {
+        StreamDebugging = new CommunicationStreamDebugging(SplusKey);
+        BufferSize = 5000;
+
+        CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+        CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
+    }
+   
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="address"></param>
+    /// <param name="port"></param>
+    /// <param name="buffefSize"></param>
+    public GenericUdpServer(string key, string address, int port, int buffefSize)
+        : base(key)
+    {
+        StreamDebugging = new CommunicationStreamDebugging(key); 
+        Hostname = address;
+        Port = port;
+        BufferSize = buffefSize;
+
+        CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
+        CrestronEnvironment.EthernetEventHandler += new EthernetEventHandler(CrestronEnvironment_EthernetEventHandler);
+    }
+
+    /// <summary>
+    /// Call from S+ to initialize values
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="address"></param>
+    /// <param name="port"></param>
+    public void Initialize(string key, string address, ushort port)
+    {
+        Key = key;
+        Hostname = address;
+        UPort = port;
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="ethernetEventArgs"></param>
+    void CrestronEnvironment_EthernetEventHandler(EthernetEventArgs ethernetEventArgs)
+    {
+        // Re-enable the server if the link comes back up and the status should be connected
+        if (ethernetEventArgs.EthernetEventType == eEthernetEventType.LinkUp
+            && IsConnected)
+        {
+            Connect();
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="programEventType"></param>
+    void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+    {
+        if (programEventType != eProgramStatusEventType.Stopping) 
+            return;
+
+        Debug.Console(1, this, "Program stopping. Disabling Server");
+        Disconnect();
+    }
+
+    /// <summary>
+    /// Enables the UDP Server
+    /// </summary>
+    public void Connect()
+    {
+        if (Server == null)
+        {
+            Server = new UDPServer();
+        }
+
+        if (string.IsNullOrEmpty(Hostname))
+        {
+            Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericUdpServer '{0}': No address set", Key);
+            return;
+        }
+        if (Port < 1 || Port > 65535)
+        {
+            {
+                Debug.Console(1, Debug.ErrorLogLevel.Warning, "GenericUdpServer '{0}': Invalid port", Key);
+                return;
+            }
+        }
+
+        var status = Server.EnableUDPServer(Hostname, Port);
+
+        Debug.Console(2, this, "SocketErrorCode: {0}", status);
+        if (status == SocketErrorCodes.SOCKET_OK)
+            IsConnected = true;
+
+        var handler = UpdateConnectionStatus;
+        if (handler != null)
+            handler(this, new GenericUdpConnectedEventArgs(UIsConnected));
+
+        // Start receiving data
+        Server.ReceiveDataAsync(Receive);
+    }
+
+    /// <summary>
+    /// Disabled the UDP Server
+    /// </summary>
+    public void Disconnect()
+    {
+        if(Server != null)
+            Server.DisableUDPServer();
+
+        IsConnected = false;
+
+        var handler = UpdateConnectionStatus;
+        if (handler != null)
+            handler(this, new GenericUdpConnectedEventArgs(UIsConnected));
+    }
+
+
+    /// <summary>
+    /// Recursive method to receive data
+    /// </summary>
+    /// <param name="server"></param>
+    /// <param name="numBytes"></param>
+    void Receive(UDPServer server, int numBytes)
+    {
+        Debug.Console(2, this, "Received {0} bytes", numBytes);
+
+        try
+        {
+            if (numBytes <= 0) 
+                return;
+
+            var sourceIp = Server.IPAddressLastMessageReceivedFrom;
+            var sourcePort = Server.IPPortLastMessageReceivedFrom;
+            var bytes = server.IncomingDataBuffer.Take(numBytes).ToArray();
+            var str = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+
+            var dataRecivedExtra = DataRecievedExtra;
+            if (dataRecivedExtra != null)
+                dataRecivedExtra(this, new GenericUdpReceiveTextExtraArgs(str, sourceIp, sourcePort, bytes));
+
+            Debug.Console(2, this, "Bytes: {0}", bytes.ToString());
+            var bytesHandler = BytesReceived;
+            if (bytesHandler != null)
+            {
+                if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                {
+                    Debug.Console(0, this, "Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
+                }
+                bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
+            }
+            var textHandler = TextReceived;
+            if (textHandler != null)
+            {
+                if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                    Debug.Console(0, this, "Received {1} characters of text: '{0}'", ComTextHelper.GetDebugText(str), str.Length);
+                textHandler(this, new GenericCommMethodReceiveTextArgs(str));
+            }
+        }
+        catch (Exception ex)
+        {
+            this.LogException(ex, "GenericUdpServer Receive error");
+        }
+        finally
+        {
+            server.ReceiveDataAsync(Receive);
+        }
+    }
+
+    /// <summary>
+    /// General send method
+    /// </summary>
+    /// <param name="text"></param>
+    public void SendText(string text)
+    {
+        var bytes = Encoding.GetEncoding(28591).GetBytes(text);
+
+        if (IsConnected && Server != null)
+        {
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, ComTextHelper.GetDebugText(text));
+
+            Server.SendData(bytes, bytes.Length);
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="bytes"></param>
+    public void SendBytes(byte[] bytes)
+    {
+        if (StreamDebugging.TxStreamDebuggingIsEnabled)
+            Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+
+        if (IsConnected && Server != null)
+            Server.SendData(bytes, bytes.Length);
+    }
+
+}
+
+/// <summary>
+/// 
+/// </summary>
 	public class GenericUdpReceiveTextExtraArgs : EventArgs
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Text { get; private set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string IpAddress { get; private set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int	Port { get; private set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public byte[] Bytes { get; private set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="text"></param>
-        /// <param name="ipAddress"></param>
-        /// <param name="port"></param>
-        /// <param name="bytes"></param>
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="text"></param>
+    /// <param name="ipAddress"></param>
+    /// <param name="port"></param>
+    /// <param name="bytes"></param>
 		public GenericUdpReceiveTextExtraArgs(string text, string ipAddress, int port, byte[] bytes)
 		{
 			Text = text;
@@ -363,34 +363,33 @@ namespace PepperDash.Core
 		public GenericUdpReceiveTextExtraArgs() { }
 	}
 
+/// <summary>
+/// 
+/// </summary>
+public class UdpServerPropertiesConfig
+{
     /// <summary>
     /// 
     /// </summary>
-    public class UdpServerPropertiesConfig
+    [JsonProperty(Required = Required.Always)]
+    public string Address { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    [JsonProperty(Required = Required.Always)]
+    public int Port { get; set; }
+
+    /// <summary>
+    /// Defaults to 32768
+    /// </summary>
+    public int BufferSize { get; set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public UdpServerPropertiesConfig()
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        [JsonProperty(Required = Required.Always)]
-        public string Address { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        [JsonProperty(Required = Required.Always)]
-        public int Port { get; set; }
-
-        /// <summary>
-        /// Defaults to 32768
-        /// </summary>
-        public int BufferSize { get; set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public UdpServerPropertiesConfig()
-        {
-            BufferSize = 32768;
-        }
+        BufferSize = 32768;
     }
 }

src/PepperDash.Core/Comm/TcpClientConfigObject.cs

@@ -1,59 +1,58 @@
 using Newtonsoft.Json;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Client config object for TCP client with server that inherits from TcpSshPropertiesConfig and adds properties for shared key and heartbeat
+/// </summary>
+public class TcpClientConfigObject
 {
     /// <summary>
-    /// Client config object for TCP client with server that inherits from TcpSshPropertiesConfig and adds properties for shared key and heartbeat
+    /// TcpSsh Properties 
     /// </summary>
-    public class TcpClientConfigObject
-    {
-        /// <summary>
-        /// TcpSsh Properties 
-        /// </summary>
-        [JsonProperty("control")]
-        public ControlPropertiesConfig Control { get; set; }
+    [JsonProperty("control")]
+    public ControlPropertiesConfig Control { get; set; }
 
-        /// <summary>
-        /// Bool value for secure. Currently not implemented in TCP sockets as they are not dynamic
-        /// </summary>
-        [JsonProperty("secure")]
-        public bool Secure { get; set; }
+    /// <summary>
+    /// Bool value for secure. Currently not implemented in TCP sockets as they are not dynamic
+    /// </summary>
+    [JsonProperty("secure")]
+    public bool Secure { get; set; }
 
-        /// <summary>
-        /// Require a shared key that both server and client negotiate. If negotiation fails server disconnects the client
-        /// </summary>
-        [JsonProperty("sharedKeyRequired")]
-        public bool SharedKeyRequired { get; set; }
+    /// <summary>
+    /// Require a shared key that both server and client negotiate. If negotiation fails server disconnects the client
+    /// </summary>
+    [JsonProperty("sharedKeyRequired")]
+    public bool SharedKeyRequired { get; set; }
 
-        /// <summary>
-        /// The shared key that must match on the server and client
-        /// </summary>
-        [JsonProperty("sharedKey")]
-        public string SharedKey { get; set; }
+    /// <summary>
+    /// The shared key that must match on the server and client
+    /// </summary>
+    [JsonProperty("sharedKey")]
+    public string SharedKey { get; set; }
 
-        /// <summary>
-        /// Require a heartbeat on the client/server connection that will cause the server/client to disconnect if the heartbeat is not received. 
-        /// heartbeats do not raise received events. 
-        /// </summary>
-        [JsonProperty("heartbeatRequired")]
-        public bool HeartbeatRequired { get; set; }
+    /// <summary>
+    /// Require a heartbeat on the client/server connection that will cause the server/client to disconnect if the heartbeat is not received. 
+    /// heartbeats do not raise received events. 
+    /// </summary>
+    [JsonProperty("heartbeatRequired")]
+    public bool HeartbeatRequired { get; set; }
 
-        /// <summary>
-        /// The interval in seconds for the heartbeat from the client. If not received client is disconnected
-        /// </summary>
-        [JsonProperty("heartbeatRequiredIntervalInSeconds")]
-        public ushort HeartbeatRequiredIntervalInSeconds { get; set; }
+    /// <summary>
+    /// The interval in seconds for the heartbeat from the client. If not received client is disconnected
+    /// </summary>
+    [JsonProperty("heartbeatRequiredIntervalInSeconds")]
+    public ushort HeartbeatRequiredIntervalInSeconds { get; set; }
 
-        /// <summary>
-        /// HeartbeatString that will be checked against the message received. defaults to heartbeat if no string is provided. 
-        /// </summary>
-        [JsonProperty("heartbeatStringToMatch")]
-        public string HeartbeatStringToMatch { get; set; }
+    /// <summary>
+    /// HeartbeatString that will be checked against the message received. defaults to heartbeat if no string is provided. 
+    /// </summary>
+    [JsonProperty("heartbeatStringToMatch")]
+    public string HeartbeatStringToMatch { get; set; }
 
-        /// <summary>
-        /// Receive Queue size must be greater than 20 or defaults to 20
-        /// </summary>
-        [JsonProperty("receiveQueueSize")]
-        public int ReceiveQueueSize { get; set; }
-    }
+    /// <summary>
+    /// Receive Queue size must be greater than 20 or defaults to 20
+    /// </summary>
+    [JsonProperty("receiveQueueSize")]
+    public int ReceiveQueueSize { get; set; }
 }

src/PepperDash.Core/Comm/TcpServerConfigObject.cs

@@ -4,57 +4,56 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Tcp Server Config object with properties for a tcp server with shared key and heartbeat capabilities
+/// </summary>
+public class TcpServerConfigObject
 {
     /// <summary>
-    /// Tcp Server Config object with properties for a tcp server with shared key and heartbeat capabilities
+    /// Uique key
     /// </summary>
-    public class TcpServerConfigObject
-    {
-        /// <summary>
-        /// Uique key
-        /// </summary>
-        public string Key { get; set; }
-        /// <summary>
-        /// Max Clients that the server will allow to connect. 
-        /// </summary>
-        public ushort MaxClients { get; set; }
-        /// <summary>
-        /// Bool value for secure. Currently not implemented in TCP sockets as they are not dynamic
-        /// </summary>
-        public bool Secure { get; set; }
-        /// <summary>
-        /// Port for the server to listen on
-        /// </summary>
-        public int Port { get; set; }
-        /// <summary>
-        /// Require a shared key that both server and client negotiate. If negotiation fails server disconnects the client
-        /// </summary>
-        public bool SharedKeyRequired { get; set; }
-        /// <summary>
-        /// The shared key that must match on the server and client
-        /// </summary>
-        public string SharedKey { get; set; }
-        /// <summary>
-        /// Require a heartbeat on the client/server connection that will cause the server/client to disconnect if the heartbeat is not received. 
-        /// heartbeats do not raise received events. 
-        /// </summary>
-        public bool HeartbeatRequired { get; set; }
-        /// <summary>
-        /// The interval in seconds for the heartbeat from the client. If not received client is disconnected
-        /// </summary>
-        public ushort HeartbeatRequiredIntervalInSeconds { get; set; }
-        /// <summary>
-        /// HeartbeatString that will be checked against the message received. defaults to heartbeat if no string is provided. 
-        /// </summary>
-        public string HeartbeatStringToMatch { get; set; }
-        /// <summary>
-        /// Client buffer size. See Crestron help. defaults to 2000 if not greater than 2000
-        /// </summary>
-        public int BufferSize { get; set; }
-        /// <summary>
-        /// Receive Queue size must be greater than 20 or defaults to 20
-        /// </summary>
-        public int ReceiveQueueSize { get; set; }
-    }
+    public string Key { get; set; }
+    /// <summary>
+    /// Max Clients that the server will allow to connect. 
+    /// </summary>
+    public ushort MaxClients { get; set; }
+    /// <summary>
+    /// Bool value for secure. Currently not implemented in TCP sockets as they are not dynamic
+    /// </summary>
+    public bool Secure { get; set; }
+    /// <summary>
+    /// Port for the server to listen on
+    /// </summary>
+    public int Port { get; set; }
+    /// <summary>
+    /// Require a shared key that both server and client negotiate. If negotiation fails server disconnects the client
+    /// </summary>
+    public bool SharedKeyRequired { get; set; }
+    /// <summary>
+    /// The shared key that must match on the server and client
+    /// </summary>
+    public string SharedKey { get; set; }
+    /// <summary>
+    /// Require a heartbeat on the client/server connection that will cause the server/client to disconnect if the heartbeat is not received. 
+    /// heartbeats do not raise received events. 
+    /// </summary>
+    public bool HeartbeatRequired { get; set; }
+    /// <summary>
+    /// The interval in seconds for the heartbeat from the client. If not received client is disconnected
+    /// </summary>
+    public ushort HeartbeatRequiredIntervalInSeconds { get; set; }
+    /// <summary>
+    /// HeartbeatString that will be checked against the message received. defaults to heartbeat if no string is provided. 
+    /// </summary>
+    public string HeartbeatStringToMatch { get; set; }
+    /// <summary>
+    /// Client buffer size. See Crestron help. defaults to 2000 if not greater than 2000
+    /// </summary>
+    public int BufferSize { get; set; }
+    /// <summary>
+    /// Receive Queue size must be greater than 20 or defaults to 20
+    /// </summary>
+    public int ReceiveQueueSize { get; set; }
 }

src/PepperDash.Core/Comm/eControlMethods.cs

@@ -4,76 +4,75 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Crestron Control Methods for a comm object
+/// </summary>
+public enum eControlMethod
 {
     /// <summary>
-    /// Crestron Control Methods for a comm object
+    /// 
     /// </summary>
-    public enum eControlMethod
-    {
-        /// <summary>
-        /// 
-        /// </summary>
-        None = 0,
-        /// <summary>
-        /// RS232/422/485
-        /// </summary>
-        Com,
-        /// <summary>
-        /// Crestron IpId (most Crestron ethernet devices)
-        /// </summary>
-        IpId,
-        /// <summary>
-        /// Crestron IpIdTcp (HD-MD series, etc.)
-        /// </summary>
-        IpidTcp,
-        /// <summary>
-        /// Crestron IR control
-        /// </summary>
-        IR,
-        /// <summary>
-        /// SSH client
-        /// </summary>
-        Ssh,
-        /// <summary>
-        /// TCP/IP client
-        /// </summary>
-        Tcpip,
-        /// <summary>
-        /// Telnet
-        /// </summary>
-        Telnet,
-        /// <summary>
-        /// Crestnet device
-        /// </summary>
-        Cresnet,
-        /// <summary>
-        /// CEC Control, via a DM HDMI port
-        /// </summary>
-        Cec,
-        /// <summary>
-        /// UDP Server
-        /// </summary>
-        Udp,
-        /// <summary>
-        /// HTTP client
-        /// </summary>
-        Http,
-        /// <summary>
-        /// HTTPS client
-        /// </summary>
-        Https,
-        /// <summary>
-        /// Websocket client
-        /// </summary>
-        Ws,
-        /// <summary>
-        /// Secure Websocket client 
-        /// </summary>
-        Wss,
-        /// <summary>
-        /// Secure TCP/IP
-        /// </summary>
-        SecureTcpIp
-    }
+    None = 0,
+    /// <summary>
+    /// RS232/422/485
+    /// </summary>
+    Com,
+    /// <summary>
+    /// Crestron IpId (most Crestron ethernet devices)
+    /// </summary>
+    IpId,
+    /// <summary>
+    /// Crestron IpIdTcp (HD-MD series, etc.)
+    /// </summary>
+    IpidTcp,
+    /// <summary>
+    /// Crestron IR control
+    /// </summary>
+    IR,
+    /// <summary>
+    /// SSH client
+    /// </summary>
+    Ssh,
+    /// <summary>
+    /// TCP/IP client
+    /// </summary>
+    Tcpip,
+    /// <summary>
+    /// Telnet
+    /// </summary>
+    Telnet,
+    /// <summary>
+    /// Crestnet device
+    /// </summary>
+    Cresnet,
+    /// <summary>
+    /// CEC Control, via a DM HDMI port
+    /// </summary>
+    Cec,
+    /// <summary>
+    /// UDP Server
+    /// </summary>
+    Udp,
+    /// <summary>
+    /// HTTP client
+    /// </summary>
+    Http,
+    /// <summary>
+    /// HTTPS client
+    /// </summary>
+    Https,
+    /// <summary>
+    /// Websocket client
+    /// </summary>
+    Ws,
+    /// <summary>
+    /// Secure Websocket client 
+    /// </summary>
+    Wss,
+    /// <summary>
+    /// Secure TCP/IP
+    /// </summary>
+    SecureTcpIp
 }

src/PepperDash.Core/CommunicationExtras.cs

@@ -7,74 +7,74 @@ using Crestron.SimplSharp.CrestronSockets;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// An incoming communication stream
+/// </summary>
+public interface ICommunicationReceiver : IKeyed
 {
     /// <summary>
-    /// An incoming communication stream
+    /// Notifies of bytes received
     /// </summary>
-    public interface ICommunicationReceiver : IKeyed
-    {
-        /// <summary>
-        /// Notifies of bytes received
-        /// </summary>
-        event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
-        /// <summary>
-        /// Notifies of text received
-        /// </summary>
-        event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
+    event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
+    /// <summary>
+    /// Notifies of text received
+    /// </summary>
+    event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
-        /// <summary>
-        /// Indicates connection status
-        /// </summary>
-        [JsonProperty("isConnected")]
-        bool IsConnected { get; }
-        /// <summary>
-        /// Connect to the device
-        /// </summary>
-        void Connect();
-        /// <summary>
-        /// Disconnect from the device
-        /// </summary>
-        void Disconnect();
-    }
+    /// <summary>
+    /// Indicates connection status
+    /// </summary>
+    [JsonProperty("isConnected")]
+    bool IsConnected { get; }
+    /// <summary>
+    /// Connect to the device
+    /// </summary>
+    void Connect();
+    /// <summary>
+    /// Disconnect from the device
+    /// </summary>
+    void Disconnect();
+}
 
 	/// <summary>
 	/// Represents a device that uses basic connection
 	/// </summary>
-    public interface IBasicCommunication : ICommunicationReceiver
+public interface IBasicCommunication : ICommunicationReceiver
 	{
-        /// <summary>
-        /// Send text to the device
-        /// </summary>
-        /// <param name="text"></param>
+    /// <summary>
+    /// Send text to the device
+    /// </summary>
+    /// <param name="text"></param>
 		void SendText(string text);
 
-        /// <summary>
-        /// Send bytes to the device
-        /// </summary>
-        /// <param name="bytes"></param>
+    /// <summary>
+    /// Send bytes to the device
+    /// </summary>
+    /// <param name="bytes"></param>
 		void SendBytes(byte[] bytes);
 	}
 
-    /// <summary>
-    /// Represents a device that implements IBasicCommunication and IStreamDebugging
-    /// </summary>
-    public interface IBasicCommunicationWithStreamDebugging : IBasicCommunication, IStreamDebugging
-    {
+/// <summary>
+/// Represents a device that implements IBasicCommunication and IStreamDebugging
+/// </summary>
+public interface IBasicCommunicationWithStreamDebugging : IBasicCommunication, IStreamDebugging
+{
 
-    }
+}
 
+/// <summary>
+/// Represents a device with stream debugging capablities
+/// </summary>
+public interface IStreamDebugging
+{
     /// <summary>
-    /// Represents a device with stream debugging capablities
+    /// Object to enable stream debugging
     /// </summary>
-    public interface IStreamDebugging
-    {
-        /// <summary>
-        /// Object to enable stream debugging
-        /// </summary>
-        [JsonProperty("streamDebugging")]
-        CommunicationStreamDebugging StreamDebugging { get; }
-    }
+    [JsonProperty("streamDebugging")]
+    CommunicationStreamDebugging StreamDebugging { get; }
+}
 
 	/// <summary>
 	/// For IBasicCommunication classes that have SocketStatus. GenericSshClient,
@@ -82,41 +82,41 @@ namespace PepperDash.Core
 	/// </summary>
 	public interface ISocketStatus : IBasicCommunication
 	{
-        /// <summary>
-        /// Notifies of socket status changes
-        /// </summary>
+    /// <summary>
+    /// Notifies of socket status changes
+    /// </summary>
 		event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
 
-        /// <summary>
-        /// The current socket status of the client
-        /// </summary>
-        [JsonProperty("clientStatus")]
-        [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
-        SocketStatus ClientStatus { get; }
+    /// <summary>
+    /// The current socket status of the client
+    /// </summary>
+    [JsonProperty("clientStatus")]
+    [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
+    SocketStatus ClientStatus { get; }
 	}
 
-    /// <summary>
-    /// Describes a device that implements ISocketStatus and IStreamDebugging
-    /// </summary>
-    public interface ISocketStatusWithStreamDebugging : ISocketStatus, IStreamDebugging
-    {
+/// <summary>
+/// Describes a device that implements ISocketStatus and IStreamDebugging
+/// </summary>
+public interface ISocketStatusWithStreamDebugging : ISocketStatus, IStreamDebugging
+{
 
-    }
+}
 
-    /// <summary>
-    /// Describes a device that can automatically attempt to reconnect
-    /// </summary>
+/// <summary>
+/// Describes a device that can automatically attempt to reconnect
+/// </summary>
 	public interface IAutoReconnect
 	{
-        /// <summary>
-        /// Enable automatic recconnect
-        /// </summary>
-        [JsonProperty("autoReconnect")]
+    /// <summary>
+    /// Enable automatic recconnect
+    /// </summary>
+    [JsonProperty("autoReconnect")]
 		bool AutoReconnect { get; set; }
-        /// <summary>
-        /// Interval in ms to attempt automatic recconnections
-        /// </summary>
-        [JsonProperty("autoReconnectIntervalMs")]
+    /// <summary>
+    /// Interval in ms to attempt automatic recconnections
+    /// </summary>
+    [JsonProperty("autoReconnectIntervalMs")]
 		int AutoReconnectIntervalMs { get; set; }
 	}
 
@@ -125,14 +125,14 @@ namespace PepperDash.Core
 	/// </summary>
 	public enum eGenericCommMethodStatusChangeType
 	{
-        /// <summary>
-        /// Connected
-        /// </summary>
+    /// <summary>
+    /// Connected
+    /// </summary>
 		Connected,
-        /// <summary>
-        /// Disconnected
-        /// </summary>
-        Disconnected
+    /// <summary>
+    /// Disconnected
+    /// </summary>
+    Disconnected
 	}
 
 	/// <summary>
@@ -147,15 +147,15 @@ namespace PepperDash.Core
 	/// </summary>
 	public class GenericCommMethodReceiveBytesArgs : EventArgs
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public byte[] Bytes { get; private set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="bytes"></param>
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="bytes"></param>
 		public GenericCommMethodReceiveBytesArgs(byte[] bytes)
 		{
 			Bytes = bytes;
@@ -172,33 +172,33 @@ namespace PepperDash.Core
 	/// </summary>
 	public class GenericCommMethodReceiveTextArgs : EventArgs
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Text { get; private set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Delimiter { get; private set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="text"></param>
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Delimiter { get; private set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="text"></param>
 		public GenericCommMethodReceiveTextArgs(string text)
 		{
 			Text = text;
 		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="text"></param>
-        /// <param name="delimiter"></param>
-        public GenericCommMethodReceiveTextArgs(string text, string delimiter)
-            :this(text)
-        {
-            Delimiter = delimiter;
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="text"></param>
+    /// <param name="delimiter"></param>
+    public GenericCommMethodReceiveTextArgs(string text, string delimiter)
+        :this(text)
+    {
+        Delimiter = delimiter;
+    }
 
 		/// <summary>
 		/// S+ Constructor
@@ -213,35 +213,34 @@ namespace PepperDash.Core
 	/// </summary>
 	public class ComTextHelper
 	{
-        /// <summary>
-        /// Gets escaped text for a byte array
-        /// </summary>
-        /// <param name="bytes"></param>
-        /// <returns></returns>
+    /// <summary>
+    /// Gets escaped text for a byte array
+    /// </summary>
+    /// <param name="bytes"></param>
+    /// <returns></returns>
 		public static string GetEscapedText(byte[] bytes)
 		{
 			return String.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
 		}
 
-        /// <summary>
-        /// Gets escaped text for a string
-        /// </summary>
-        /// <param name="text"></param>
-        /// <returns></returns>
+    /// <summary>
+    /// Gets escaped text for a string
+    /// </summary>
+    /// <param name="text"></param>
+    /// <returns></returns>
 		public static string GetEscapedText(string text)
 		{
 			var bytes = Encoding.GetEncoding(28591).GetBytes(text);
 			return String.Concat(bytes.Select(b => string.Format(@"[{0:X2}]", (int)b)).ToArray());
 		}
 
-        /// <summary>
-        /// Gets debug text for a string
-        /// </summary>
-        /// <param name="text"></param>
-        /// <returns></returns>
-        public static string GetDebugText(string text)
-        {
-            return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
-        }
-	}
-}
+    /// <summary>
+    /// Gets debug text for a string
+    /// </summary>
+    /// <param name="text"></param>
+    /// <returns></returns>
+    public static string GetDebugText(string text)
+    {
+        return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
+    }
+	}

src/PepperDash.Core/Config/PortalConfigReader.cs

@@ -7,11 +7,11 @@ using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 using Serilog.Events;
 
-namespace PepperDash.Core.Config
-{
-    /// <summary>
-    /// Reads a Portal formatted config file
-    /// </summary>
+namespace PepperDash.Core.Config;
+
+/// <summary>
+/// Reads a Portal formatted config file
+/// </summary>
 	public class PortalConfigReader
 	{
 		/// <summary>
@@ -100,31 +100,31 @@ namespace PepperDash.Core.Config
 		            Merge(template["destinationLists"], system["destinationLists"], "destinationLists"));
 
 
-            if (system["cameraLists"] == null)
-                merged.Add("cameraLists", template["cameraLists"]);
-            else
-                merged.Add("cameraLists", Merge(template["cameraLists"], system["cameraLists"], "cameraLists"));
+        if (system["cameraLists"] == null)
+            merged.Add("cameraLists", template["cameraLists"]);
+        else
+            merged.Add("cameraLists", Merge(template["cameraLists"], system["cameraLists"], "cameraLists"));
 
-            if (system["audioControlPointLists"] == null)
-                merged.Add("audioControlPointLists", template["audioControlPointLists"]);
-            else
-                merged.Add("audioControlPointLists",
-                    Merge(template["audioControlPointLists"], system["audioControlPointLists"], "audioControlPointLists"));
+        if (system["audioControlPointLists"] == null)
+            merged.Add("audioControlPointLists", template["audioControlPointLists"]);
+        else
+            merged.Add("audioControlPointLists",
+                Merge(template["audioControlPointLists"], system["audioControlPointLists"], "audioControlPointLists"));
 
 
-            // Template tie lines take precedence.  Config tool doesn't do them at system
-            // level anyway...
-            if (template["tieLines"] != null)
+        // Template tie lines take precedence.  Config tool doesn't do them at system
+        // level anyway...
+        if (template["tieLines"] != null)
 				merged.Add("tieLines", template["tieLines"]);
 			else if (system["tieLines"] != null)
 				merged.Add("tieLines", system["tieLines"]);
 			else
 				merged.Add("tieLines", new JArray());
 
-            if (template["joinMaps"] != null)
-                merged.Add("joinMaps", template["joinMaps"]);
-            else
-                merged.Add("joinMaps", new JObject());
+        if (template["joinMaps"] != null)
+            merged.Add("joinMaps", template["joinMaps"]);
+        else
+            merged.Add("joinMaps", new JObject());
 
 			if (system["global"] != null)
 				merged.Add("global", Merge(template["global"], system["global"], "global"));
@@ -147,26 +147,26 @@ namespace PepperDash.Core.Config
 				return a1;
 			else if (a1 != null)
 			{
-                if (a2[0]["key"] == null) // If the first item in the system array has no key, overwrite the template array
-                {                                                       // with the system array
-                    return a2;
-                }
-                else    // The arrays are keyed, merge them by key
+            if (a2[0]["key"] == null) // If the first item in the system array has no key, overwrite the template array
+            {                                                       // with the system array
+                return a2;
+            }
+            else    // The arrays are keyed, merge them by key
+            {
+                for (int i = 0; i < a1.Count(); i++)
                 {
-                    for (int i = 0; i < a1.Count(); i++)
+                    var a1Dev = a1[i];
+                    // Try to get a system device and if found, merge it onto template
+                    var a2Match = a2.FirstOrDefault(t => t[propertyName].Equals(a1Dev[propertyName]));// t.Value<int>("uid") == tmplDev.Value<int>("uid"));
+                    if (a2Match != null)
                     {
-                        var a1Dev = a1[i];
-                        // Try to get a system device and if found, merge it onto template
-                        var a2Match = a2.FirstOrDefault(t => t[propertyName].Equals(a1Dev[propertyName]));// t.Value<int>("uid") == tmplDev.Value<int>("uid"));
-                        if (a2Match != null)
-                        {
-                            var mergedItem = Merge(a1Dev, a2Match, string.Format("{0}[{1}].", path, i));// Merge(JObject.FromObject(a1Dev), JObject.FromObject(a2Match));
-                            result.Add(mergedItem);
-                        }
-                        else
-                            result.Add(a1Dev);
+                        var mergedItem = Merge(a1Dev, a2Match, string.Format("{0}[{1}].", path, i));// Merge(JObject.FromObject(a1Dev), JObject.FromObject(a2Match));
+                        result.Add(mergedItem);
                     }
+                    else
+                        result.Add(a1Dev);
                 }
+            }
 			}
 			return result;
 		}
@@ -183,9 +183,9 @@ namespace PepperDash.Core.Config
 		/// <summary>
 		/// Merge o2 onto o1
 		/// </summary>
-        /// <param name="o1"></param>
-        /// <param name="o2"></param>
-        /// <param name="path"></param>
+    /// <param name="o1"></param>
+    /// <param name="o2"></param>
+    /// <param name="path"></param>
 		static JObject Merge(JObject o1, JObject o2, string path)
 		{
 			foreach (var o2Prop in o2)
@@ -231,5 +231,4 @@ namespace PepperDash.Core.Config
 			}
 			return o1;
 		}
-	}
-}
+	}

src/PepperDash.Core/Conversion/Convert.cs

@@ -4,19 +4,18 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+public class EncodingHelper
 {
-    public class EncodingHelper
+    public static string ConvertUtf8ToAscii(string utf8String)
     {
-        public static string ConvertUtf8ToAscii(string utf8String)
-        {
-            return Encoding.ASCII.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
-        }
-
-        public static string ConvertUtf8ToUtf16(string utf8String)
-        {
-            return Encoding.Unicode.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
-        }
-
+        return Encoding.ASCII.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
     }
+
+    public static string ConvertUtf8ToUtf16(string utf8String)
+    {
+        return Encoding.Unicode.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
+    }
+
 }

src/PepperDash.Core/CoreInterfaces.cs

@@ -6,30 +6,28 @@ using Crestron.SimplSharp;
 using Newtonsoft.Json;
 using Serilog;
 
-namespace PepperDash.Core
-{
-    /// <summary>
-    /// Unique key interface to require a unique key for the class
-    /// </summary>
+namespace PepperDash.Core;
+
+/// <summary>
+/// Unique key interface to require a unique key for the class
+/// </summary>
 	public interface IKeyed
 	{
-        /// <summary>
-        /// Unique Key
-        /// </summary>
-        [JsonProperty("key")]
-		string Key { get; }
-    }
-
-    /// <summary>
-    /// Named Keyed device interface. Forces the device to have a Unique Key and a name. 
+    /// <summary>
+    /// Gets the unique key associated with the object.
     /// </summary>
-	public interface IKeyName : IKeyed
-    {
-        /// <summary>
-        /// Isn't it obvious :)
-        /// </summary>
-        [JsonProperty("name")]
-		string Name { get; }
-    }
+    [JsonProperty("key")]
+		string Key { get; }
+}
 
+/// <summary>
+/// Named Keyed device interface. Forces the device to have a Unique Key and a name. 
+/// </summary>
+	public interface IKeyName : IKeyed
+{
+    /// <summary>
+    /// Gets the name associated with the current object.
+    /// </summary>
+    [JsonProperty("name")]
+		string Name { get; }
 }

src/PepperDash.Core/Device.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using Serilog.Events;
 
-namespace PepperDash.Core
-{
+namespace PepperDash.Core;
+
 	//*********************************************************************************************************
 	/// <summary>
 	/// The core event and status-bearing class that most if not all device and connectors can derive from.
@@ -178,15 +178,14 @@ namespace PepperDash.Core
 			if (o is bool && !(bool)o) a();
 		}
 
-        /// <summary>
-        /// Returns a string representation of the object, including its key and name.
-        /// </summary>
-        /// <remarks>The returned string is formatted as "{Key} - {Name}". If the <c>Name</c> property is
-        /// null or empty,  "---" is used in place of the name.</remarks>
-        /// <returns>A string that represents the object, containing the key and name in the format "{Key} - {Name}".</returns>
+    /// <summary>
+    /// Returns a string representation of the object, including its key and name.
+    /// </summary>
+    /// <remarks>The returned string is formatted as "{Key} - {Name}". If the <c>Name</c> property is
+    /// null or empty,  "---" is used in place of the name.</remarks>
+    /// <returns>A string that represents the object, containing the key and name in the format "{Key} - {Name}".</returns>
 		public override string ToString()
 		{
 			return string.Format("{0} - {1}", Key, string.IsNullOrEmpty(Name) ? "---" : Name);
 		}
-	}
-}
+	}

src/PepperDash.Core/EthernetHelper.cs

@@ -2,11 +2,11 @@
 using Newtonsoft.Json;
 using Serilog.Events;
 
-namespace PepperDash.Core
-{
-    /// <summary>
-    /// Class to help with accessing values from the CrestronEthernetHelper class 
-    /// </summary>
+namespace PepperDash.Core;
+
+/// <summary>
+/// Class to help with accessing values from the CrestronEthernetHelper class 
+/// </summary>
 	public class EthernetHelper
 	{
 		/// <summary>
@@ -113,5 +113,4 @@ namespace PepperDash.Core
 					CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, 0);
 			}
 		}
-	}
-}
+	}

src/PepperDash.Core/EventArgs.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core
-{
+namespace PepperDash.Core;
+
 	/// <summary>
 	/// Bool change event args
 	/// </summary>
@@ -168,5 +168,4 @@ namespace PepperDash.Core
 			Type = type;
 			Index = index;
 		}
-	}	
-}
+	}	

src/PepperDash.Core/GenericRESTfulCommunications/Constants.cs

@@ -4,13 +4,13 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.GenericRESTfulCommunications
-{
+namespace PepperDash.Core.GenericRESTfulCommunications;
+
 	/// <summary>
 	/// Constants
 	/// </summary>
-    public class GenericRESTfulConstants
-    {
+public class GenericRESTfulConstants
+{
 		/// <summary>
 		/// Generic boolean change
 		/// </summary>
@@ -35,5 +35,4 @@ namespace PepperDash.Core.GenericRESTfulCommunications
 		/// Error string change
 		/// </summary>
 		public const ushort ErrorStringChange = 203;
-    }
 }

src/PepperDash.Core/GenericRESTfulCommunications/GenericRESTfulClient.cs

@@ -6,8 +6,8 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.Net.Http;
 using Crestron.SimplSharp.Net.Https;
 
-namespace PepperDash.Core.GenericRESTfulCommunications
-{
+namespace PepperDash.Core.GenericRESTfulCommunications;
+
 	/// <summary>
 	/// Generic RESTful communication class
 	/// </summary>
@@ -42,7 +42,7 @@ namespace PepperDash.Core.GenericRESTfulCommunications
 		/// <param name="requestType"></param>
 		/// <param name="username"></param>
 		/// <param name="password"></param>
-        /// <param name="contentType"></param>
+    /// <param name="contentType"></param>
 		public void SubmitRequest(string url, ushort port, ushort requestType, string contentType, string username, string password)
 		{
 			if (url.StartsWith("https:", StringComparison.OrdinalIgnoreCase))
@@ -65,7 +65,7 @@ namespace PepperDash.Core.GenericRESTfulCommunications
 		/// <param name="url"></param>
 		/// <param name="port"></param>
 		/// <param name="requestType"></param>
-        /// <param name="contentType"></param>
+    /// <param name="contentType"></param>
 		/// <param name="username"></param>
 		/// <param name="password"></param>
 		private void SubmitRequestHttp(string url, ushort port, ushort requestType, string contentType, string username, string password)
@@ -123,7 +123,7 @@ namespace PepperDash.Core.GenericRESTfulCommunications
 		/// <param name="url"></param>
 		/// <param name="port"></param>
 		/// <param name="requestType"></param>
-        /// <param name="contentType"></param>
+    /// <param name="contentType"></param>
 		/// <param name="username"></param>
 		/// <param name="password"></param>
 		private void SubmitRequestHttps(string url, ushort port, ushort requestType, string contentType, string username, string password)
@@ -252,5 +252,4 @@ namespace PepperDash.Core.GenericRESTfulCommunications
 				StringChange(this, args);
 			}
 		}
-	}
-}
+	}

src/PepperDash.Core/JsonStandardObjects/EventArgs and Constants.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.JsonStandardObjects
-{
+namespace PepperDash.Core.JsonStandardObjects;
+
 	/// <summary>
 	/// Constants for simpl modules
 	/// </summary>
@@ -73,5 +73,4 @@ namespace PepperDash.Core.JsonStandardObjects
 			Type = type;
 			Index = index;
 		}
-	}
-}
+	}

src/PepperDash.Core/JsonStandardObjects/JsonToSimplDevice.cs

@@ -4,8 +4,8 @@ using Crestron.SimplSharp;
 using PepperDash.Core.JsonToSimpl;
 using Serilog.Events;
 
-namespace PepperDash.Core.JsonStandardObjects
-{
+namespace PepperDash.Core.JsonStandardObjects;
+
 	/// <summary>
 	/// Device class
 	/// </summary>
@@ -179,5 +179,4 @@ namespace PepperDash.Core.JsonStandardObjects
 		}
 
 		#endregion EventHandler Helpers
-	}
-}
+	}

src/PepperDash.Core/JsonStandardObjects/JsonToSimplDeviceConfig.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.JsonStandardObjects
-{
+namespace PepperDash.Core.JsonStandardObjects;
+
 	/*
 	Convert JSON snippt to C#: http://json2csharp.com/#
 	
@@ -52,55 +52,55 @@ namespace PepperDash.Core.JsonStandardObjects
 	/// </summary>
 	public class ComParamsConfig
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int baudRate { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int dataBits { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int stopBits { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string parity { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string protocol { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string hardwareHandshake { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string softwareHandshake { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int pacing { get; set; }
 
 		// convert properties for simpl
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort simplBaudRate { get { return Convert.ToUInt16(baudRate); } }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort simplDataBits { get { return Convert.ToUInt16(dataBits); } }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort simplStopBits { get { return Convert.ToUInt16(stopBits); } }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort simplPacing { get { return Convert.ToUInt16(pacing); } }
 
 		/// <summary>
@@ -117,43 +117,43 @@ namespace PepperDash.Core.JsonStandardObjects
 	/// </summary>
 	public class TcpSshPropertiesConfig
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string address { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int port { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string username { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string password { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public bool autoReconnect { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int autoReconnectIntervalMs { get; set; }
 
 		// convert properties for simpl
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort simplPort { get { return Convert.ToUInt16(port); } }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort simplAutoReconnect { get { return (ushort)(autoReconnect ? 1 : 0); } }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort simplAutoReconnectIntervalMs { get { return Convert.ToUInt16(autoReconnectIntervalMs); } }
 
 		/// <summary>
@@ -170,31 +170,31 @@ namespace PepperDash.Core.JsonStandardObjects
 	/// </summary>
 	public class ControlConfig
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string method { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string controlPortDevKey { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int controlPortNumber { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ComParamsConfig comParams { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public TcpSshPropertiesConfig tcpSshProperties { get; set; }
 
 		// convert properties for simpl
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort simplControlPortNumber { get { return Convert.ToUInt16(controlPortNumber); } }
 
 		/// <summary>
@@ -212,27 +212,27 @@ namespace PepperDash.Core.JsonStandardObjects
 	/// </summary>
 	public class PropertiesConfig
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int deviceId { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public bool enabled { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ControlConfig control { get; set; }
 
 		// convert properties for simpl
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort simplDeviceId { get { return Convert.ToUInt16(deviceId); } }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort simplEnabled { get { return (ushort)(enabled ? 1 : 0); } }
 
 		/// <summary>
@@ -249,9 +249,8 @@ namespace PepperDash.Core.JsonStandardObjects
 	/// </summary>
 	public class RootObject
 	{
-        /// <summary>
-        /// The collection of devices
-        /// </summary>
+    /// <summary>
+    /// The collection of devices
+    /// </summary>
 		public List<DeviceConfig> devices { get; set; }
-	}
-}
+	}

src/PepperDash.Core/JsonToSimpl/Constants.cs

@@ -4,78 +4,78 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.JsonToSimpl
-{
+namespace PepperDash.Core.JsonToSimpl;
+
 	/// <summary>
 	/// Constants for Simpl modules
 	/// </summary>
 	public class JsonToSimplConstants
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort BoolValueChange = 1;
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort JsonIsValidBoolChange = 2;
 
-        /// <summary>
-        /// Reports the if the device is 3-series compatible
-        /// </summary>
-        public const ushort ProgramCompatibility3SeriesChange = 3;
+    /// <summary>
+    /// Reports the if the device is 3-series compatible
+    /// </summary>
+    public const ushort ProgramCompatibility3SeriesChange = 3;
 
-        /// <summary>
-        /// Reports the if the device is 4-series compatible
-        /// </summary>
-        public const ushort ProgramCompatibility4SeriesChange = 4;
+    /// <summary>
+    /// Reports the if the device is 4-series compatible
+    /// </summary>
+    public const ushort ProgramCompatibility4SeriesChange = 4;
 
-        /// <summary>
-        /// Reports the device platform enum value
-        /// </summary>
-        public const ushort DevicePlatformValueChange = 5;
+    /// <summary>
+    /// Reports the device platform enum value
+    /// </summary>
+    public const ushort DevicePlatformValueChange = 5;
 
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort UshortValueChange = 101;        
 		
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort StringValueChange = 201;
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort FullPathToArrayChange = 202;
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort ActualFilePathChange = 203;
 
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort FilenameResolvedChange = 204;
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort FilePathResolvedChange = 205;
 
-        /// <summary>
-        /// Reports the root directory change
-        /// </summary>
-        public const ushort RootDirectoryChange = 206;
+    /// <summary>
+    /// Reports the root directory change
+    /// </summary>
+    public const ushort RootDirectoryChange = 206;
 
-        /// <summary>
-        /// Reports the room ID change
-        /// </summary>
-        public const ushort RoomIdChange = 207;
+    /// <summary>
+    /// Reports the room ID change
+    /// </summary>
+    public const ushort RoomIdChange = 207;
 
-        /// <summary>
-        /// Reports the room name change
-        /// </summary>
-        public const ushort RoomNameChange = 208;
+    /// <summary>
+    /// Reports the room name change
+    /// </summary>
+    public const ushort RoomNameChange = 208;
 	}
 
 	/// <summary>
@@ -88,33 +88,33 @@ namespace PepperDash.Core.JsonToSimpl
 	/// </summary>
 	public class SPlusValueWrapper
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public SPlusType ValueType { get; private set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort Index { get; private set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort BoolUShortValue { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string StringValue { get; set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public SPlusValueWrapper() {}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="index"></param>
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="type"></param>
+    /// <param name="index"></param>
 		public SPlusValueWrapper(SPlusType type, ushort index)
 		{
 			ValueType = type;
@@ -127,17 +127,16 @@ namespace PepperDash.Core.JsonToSimpl
 	/// </summary>
 	public enum SPlusType
 	{
-        /// <summary>
-        /// Digital
-        /// </summary>
+    /// <summary>
+    /// Digital
+    /// </summary>
 		Digital, 
-        /// <summary>
-        /// Analog
-        /// </summary>
-        Analog, 
-        /// <summary>
-        /// String
-        /// </summary>
-        String
-	}
-}
+    /// <summary>
+    /// Analog
+    /// </summary>
+    Analog, 
+    /// <summary>
+    /// String
+    /// </summary>
+    String
+	}

src/PepperDash.Core/JsonToSimpl/Global.cs

@@ -7,11 +7,11 @@ using Serilog.Events;
 
 //using PepperDash.Core;
 
-namespace PepperDash.Core.JsonToSimpl
-{
-    /// <summary>
-    /// The global class to manage all the instances of JsonToSimplMaster 
-    /// </summary>
+namespace PepperDash.Core.JsonToSimpl;
+
+/// <summary>
+/// The global class to manage all the instances of JsonToSimplMaster 
+/// </summary>
 	public class J2SGlobal
 	{
 		static List<JsonToSimplMaster> Masters = new List<JsonToSimplMaster>();
@@ -22,7 +22,7 @@ namespace PepperDash.Core.JsonToSimpl
 		/// master, this will fail
 		/// </summary>
 		/// <param name="master">New master to add</param>
-        /// 
+    /// 
 		public static void AddMaster(JsonToSimplMaster master)
 		{
 			if (master == null)
@@ -56,5 +56,4 @@ namespace PepperDash.Core.JsonToSimpl
 		{
 			return Masters.FirstOrDefault(m => m.UniqueID.Equals(file, StringComparison.OrdinalIgnoreCase));
 		}
-	}
-}
+	}

src/PepperDash.Core/JsonToSimpl/JsonToSimplArrayLookupChild.cs

@@ -3,20 +3,20 @@ using System.Linq;
 using Newtonsoft.Json.Linq;
 using Serilog.Events;
 
-namespace PepperDash.Core.JsonToSimpl
-{
-    /// <summary>
-    /// Used to interact with an array of values with the S+ modules
-    /// </summary>
+namespace PepperDash.Core.JsonToSimpl;
+
+/// <summary>
+/// Used to interact with an array of values with the S+ modules
+/// </summary>
 	public class JsonToSimplArrayLookupChild : JsonToSimplChildObjectBase
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string SearchPropertyName { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string SearchPropertyValue { get; set; }
 
 		int ArrayIndex;
@@ -76,9 +76,9 @@ namespace PepperDash.Core.JsonToSimpl
 				PathSuffix == null ? "" : PathSuffix);
 		}
 
-        /// <summary>
-        /// Process all values
-        /// </summary>
+    /// <summary>
+    /// Process all values
+    /// </summary>
 		public override void ProcessAll()
 		{
 			if (FindInArray())
@@ -158,5 +158,4 @@ namespace PepperDash.Core.JsonToSimpl
 
 			return false;
 		}
-	}
-}
+	}

src/PepperDash.Core/JsonToSimpl/JsonToSimplChildObjectBase.cs

@@ -3,29 +3,29 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 
-namespace PepperDash.Core.JsonToSimpl
-{
-    /// <summary>
-    /// Base class for JSON objects
-    /// </summary>
+namespace PepperDash.Core.JsonToSimpl;
+
+/// <summary>
+/// Base class for JSON objects
+/// </summary>
 	public abstract class JsonToSimplChildObjectBase : IKeyed
 	{
-        /// <summary>
-        /// Notifies of bool change
-        /// </summary>
+    /// <summary>
+    /// Notifies of bool change
+    /// </summary>
 		public event EventHandler<BoolChangeEventArgs> BoolChange;
-        /// <summary>
-        /// Notifies of ushort change
-        /// </summary>
+    /// <summary>
+    /// Notifies of ushort change
+    /// </summary>
 		public event EventHandler<UshrtChangeEventArgs> UShortChange;
-        /// <summary>
-        /// Notifies of string change
-        /// </summary>
+    /// <summary>
+    /// Notifies of string change
+    /// </summary>
 		public event EventHandler<StringChangeEventArgs> StringChange;
 
-        /// <summary>
-        /// Delegate to get all values
-        /// </summary>
+    /// <summary>
+    /// Delegate to get all values
+    /// </summary>
 		public SPlusValuesDelegate GetAllValuesDelegate { get; set; }
 
 		/// <summary>
@@ -33,9 +33,9 @@ namespace PepperDash.Core.JsonToSimpl
 		/// </summary>
 		public SPlusValuesDelegate SetAllPathsDelegate { get; set; }
 
-        /// <summary>
-        /// Unique identifier for instance
-        /// </summary>
+    /// <summary>
+    /// Unique identifier for instance
+    /// </summary>
 		public string Key { get; protected set; }
 
 		/// <summary>
@@ -49,33 +49,33 @@ namespace PepperDash.Core.JsonToSimpl
 		/// </summary>
 		public string PathSuffix { get; protected set; }
 
-        /// <summary>
-        /// Indicates if the instance is linked to an object
-        /// </summary>
+    /// <summary>
+    /// Indicates if the instance is linked to an object
+    /// </summary>
 		public bool LinkedToObject { get; protected set; }
 
-        /// <summary>
-        /// Reference to Master instance
-        /// </summary>
+    /// <summary>
+    /// Reference to Master instance
+    /// </summary>
 		protected JsonToSimplMaster Master;
 
-        /// <summary>
-        /// Paths to boolean values in JSON structure
-        /// </summary>
-        protected Dictionary<ushort, string> BoolPaths = new Dictionary<ushort, string>();
-        /// <summary>
-        /// Paths to numeric values in JSON structure
-        /// </summary>
+    /// <summary>
+    /// Paths to boolean values in JSON structure
+    /// </summary>
+    protected Dictionary<ushort, string> BoolPaths = new Dictionary<ushort, string>();
+    /// <summary>
+    /// Paths to numeric values in JSON structure
+    /// </summary>
 		protected Dictionary<ushort, string> UshortPaths = new Dictionary<ushort, string>();
-        /// <summary>
-        /// Paths to string values in JSON structure
-        /// </summary>
+    /// <summary>
+    /// Paths to string values in JSON structure
+    /// </summary>
 		protected Dictionary<ushort, string> StringPaths = new Dictionary<ushort, string>();
 
 		/// <summary>
 		/// Call this before doing anything else
 		/// </summary>
-        /// <param name="masterUniqueId"></param>
+    /// <param name="masterUniqueId"></param>
 		/// <param name="key"></param>
 		/// <param name="pathPrefix"></param>
 		/// <param name="pathSuffix"></param>
@@ -92,10 +92,10 @@ namespace PepperDash.Core.JsonToSimpl
 				Debug.Console(1, "JSON Child [{0}] cannot link to master {1}", key, masterUniqueId);
 		}
 
-        /// <summary>
-        /// Sets the path prefix for the object
-        /// </summary>
-        /// <param name="pathPrefix"></param>
+    /// <summary>
+    /// Sets the path prefix for the object
+    /// </summary>
+    /// <param name="pathPrefix"></param>
 		public void SetPathPrefix(string pathPrefix)
 		{
 			PathPrefix = pathPrefix;
@@ -170,18 +170,18 @@ namespace PepperDash.Core.JsonToSimpl
 		}
 
 		// Processes the path to a ushort, converting to ushort if able, twos complement if necessary, firing off UshrtChange event
-        void ProcessUshortPath(ushort index) {
-            string response;
-            if (Process(UshortPaths[index], out response)) {
-                ushort val;
-                try { val = Convert.ToInt32(response) < 0 ? (ushort)(Convert.ToInt16(response) + 65536) : Convert.ToUInt16(response); }
-                catch { val = 0; }
+    void ProcessUshortPath(ushort index) {
+        string response;
+        if (Process(UshortPaths[index], out response)) {
+            ushort val;
+            try { val = Convert.ToInt32(response) < 0 ? (ushort)(Convert.ToInt16(response) + 65536) : Convert.ToUInt16(response); }
+            catch { val = 0; }
 
-                OnUShortChange(val, index, JsonToSimplConstants.UshortValueChange);
-            }
-            else { }
-            // OnUShortChange(0, index, JsonToSimplConstants.UshortValueChange);
+            OnUShortChange(val, index, JsonToSimplConstants.UshortValueChange);
         }
+        else { }
+        // OnUShortChange(0, index, JsonToSimplConstants.UshortValueChange);
+    }
 
 		// Processes the path to a string property and fires of a StringChange event.
 		void ProcessStringPath(ushort index)
@@ -272,54 +272,54 @@ namespace PepperDash.Core.JsonToSimpl
 				GetAllValuesDelegate();
 		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="theValue"></param>
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="theValue"></param>
 		public void USetBoolValue(ushort key, ushort theValue)
 		{
 			SetBoolValue(key, theValue == 1);
 		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="theValue"></param>
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="theValue"></param>
 		public void SetBoolValue(ushort key, bool theValue)
 		{
 			if (BoolPaths.ContainsKey(key))
 				SetValueOnMaster(BoolPaths[key], new JValue(theValue));
 		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="theValue"></param>
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="theValue"></param>
 		public void SetUShortValue(ushort key, ushort theValue)
 		{
 			if (UshortPaths.ContainsKey(key))
 				SetValueOnMaster(UshortPaths[key], new JValue(theValue));
 		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="theValue"></param>
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="theValue"></param>
 		public void SetStringValue(ushort key, string theValue)
 		{
 			if (StringPaths.ContainsKey(key))
 				SetValueOnMaster(StringPaths[key], new JValue(theValue));
 		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="keyPath"></param>
-        /// <param name="valueToSave"></param>
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="keyPath"></param>
+    /// <param name="valueToSave"></param>
 		public void SetValueOnMaster(string keyPath, JValue valueToSave)
 		{
 			var path = GetFullPath(keyPath);
@@ -349,12 +349,12 @@ namespace PepperDash.Core.JsonToSimpl
 
 		// Helpers for events
 		//******************************************************************************************
-        /// <summary>
-        /// Event helper
-        /// </summary>
-        /// <param name="state"></param>
-        /// <param name="index"></param>
-        /// <param name="type"></param>
+    /// <summary>
+    /// Event helper
+    /// </summary>
+    /// <param name="state"></param>
+    /// <param name="index"></param>
+    /// <param name="type"></param>
 		protected void OnBoolChange(bool state, ushort index, ushort type)
 		{
 			var handler = BoolChange;
@@ -367,12 +367,12 @@ namespace PepperDash.Core.JsonToSimpl
 		}
 
 		//******************************************************************************************
-        /// <summary>
-        /// Event helper
-        /// </summary>
-        /// <param name="state"></param>
-        /// <param name="index"></param>
-        /// <param name="type"></param>
+    /// <summary>
+    /// Event helper
+    /// </summary>
+    /// <param name="state"></param>
+    /// <param name="index"></param>
+    /// <param name="type"></param>
 		protected void OnUShortChange(ushort state, ushort index, ushort type)
 		{
 			var handler = UShortChange;
@@ -384,12 +384,12 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 
-        /// <summary>
-        /// Event helper
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="index"></param>
-        /// <param name="type"></param>
+    /// <summary>
+    /// Event helper
+    /// </summary>
+    /// <param name="value"></param>
+    /// <param name="index"></param>
+    /// <param name="type"></param>
 		protected void OnStringChange(string value, ushort index, ushort type)
 		{
 			var handler = StringChange;
@@ -400,5 +400,4 @@ namespace PepperDash.Core.JsonToSimpl
 				StringChange(this, args);
 			}
 		}
-	}
-}
+	}

src/PepperDash.Core/JsonToSimpl/JsonToSimplFileMaster.cs

@@ -7,281 +7,280 @@ using Crestron.SimplSharp;
 using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json.Linq;
 
-namespace PepperDash.Core.JsonToSimpl
+namespace PepperDash.Core.JsonToSimpl;
+
+/// <summary>
+/// Represents a JSON file that can be read and written to
+/// </summary>
+public class JsonToSimplFileMaster : JsonToSimplMaster
 {
     /// <summary>
-    /// Represents a JSON file that can be read and written to
+    ///  Sets the filepath as well as registers this with the Global.Masters list
     /// </summary>
-    public class JsonToSimplFileMaster : JsonToSimplMaster
+    public string Filepath { get; private set; }
+
+    /// <summary>
+    /// Filepath to the actual file that will be read (Portal or local)
+    /// </summary>
+    public string ActualFilePath { get; private set; }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Filename { get; private set; }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string FilePathName { get; private set; }
+
+    /*****************************************************************************************/
+    /** Privates **/
+
+
+    // The JSON file in JObject form
+    // For gathering the incoming data
+    object StringBuilderLock = new object();
+    // To prevent multiple same-file access
+    static object FileLock = new object();
+
+    /*****************************************************************************************/
+
+    /// <summary>
+    /// SIMPL+ default constructor.
+    /// </summary>
+    public JsonToSimplFileMaster()
     {
-        /// <summary>
-        ///  Sets the filepath as well as registers this with the Global.Masters list
-        /// </summary>
-        public string Filepath { get; private set; }
+    }
 
-        /// <summary>
-        /// Filepath to the actual file that will be read (Portal or local)
-        /// </summary>
-        public string ActualFilePath { get; private set; }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Filename { get; private set; }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string FilePathName { get; private set; }
-
-        /*****************************************************************************************/
-        /** Privates **/
-
-
-        // The JSON file in JObject form
-        // For gathering the incoming data
-        object StringBuilderLock = new object();
-        // To prevent multiple same-file access
-        static object FileLock = new object();
-
-        /*****************************************************************************************/
-
-        /// <summary>
-        /// SIMPL+ default constructor.
-        /// </summary>
-        public JsonToSimplFileMaster()
+    /// <summary>
+    /// Read, evaluate and udpate status
+    /// </summary>
+    public void EvaluateFile(string filepath)
+    {
+        try
         {
-        }
+            OnBoolChange(false, 0, JsonToSimplConstants.JsonIsValidBoolChange);
 
-        /// <summary>
-        /// Read, evaluate and udpate status
-        /// </summary>
-        public void EvaluateFile(string filepath)
-        {
-            try
+            var dirSeparator = Path.DirectorySeparatorChar;
+            var dirSeparatorAlt = Path.AltDirectorySeparatorChar;
+
+            var series = CrestronEnvironment.ProgramCompatibility;
+
+            var is3Series = (eCrestronSeries.Series3 == (series & eCrestronSeries.Series3));
+            OnBoolChange(is3Series, 0,
+                JsonToSimplConstants.ProgramCompatibility3SeriesChange);
+
+            var is4Series = (eCrestronSeries.Series4 == (series & eCrestronSeries.Series4));
+            OnBoolChange(is4Series, 0,
+                JsonToSimplConstants.ProgramCompatibility4SeriesChange);
+
+            var isServer = CrestronEnvironment.DevicePlatform == eDevicePlatform.Server;
+            OnBoolChange(isServer, 0,
+                JsonToSimplConstants.DevicePlatformValueChange);
+
+            // get the roomID
+            var roomId = Crestron.SimplSharp.InitialParametersClass.RoomId;                
+            if (!string.IsNullOrEmpty(roomId))
             {
-                OnBoolChange(false, 0, JsonToSimplConstants.JsonIsValidBoolChange);
+                OnStringChange(roomId, 0, JsonToSimplConstants.RoomIdChange);
+            }
 
-                var dirSeparator = Path.DirectorySeparatorChar;
-                var dirSeparatorAlt = Path.AltDirectorySeparatorChar;
+            // get the roomName
+            var roomName = Crestron.SimplSharp.InitialParametersClass.RoomName;
+            if (!string.IsNullOrEmpty(roomName))
+            {
+                OnStringChange(roomName, 0, JsonToSimplConstants.RoomNameChange);
+            }
 
-                var series = CrestronEnvironment.ProgramCompatibility;
+            var rootDirectory = Directory.GetApplicationRootDirectory();
+            OnStringChange(rootDirectory, 0, JsonToSimplConstants.RootDirectoryChange);                
+            
+            var splusPath = string.Empty;
+            if (Regex.IsMatch(filepath, @"user", RegexOptions.IgnoreCase))
+            {
+                if (is4Series) 
+                    splusPath = Regex.Replace(filepath, "user", "user", RegexOptions.IgnoreCase);
+                else if (isServer)
+                    splusPath = Regex.Replace(filepath, "user", "User", RegexOptions.IgnoreCase);
+                else
+                    splusPath = filepath;
+            }
 
-                var is3Series = (eCrestronSeries.Series3 == (series & eCrestronSeries.Series3));
-                OnBoolChange(is3Series, 0,
-                    JsonToSimplConstants.ProgramCompatibility3SeriesChange);
+            filepath = splusPath.Replace(dirSeparatorAlt, dirSeparator);
+            
+            Filepath = string.Format("{1}{0}{2}", dirSeparator, rootDirectory,
+                filepath.TrimStart(dirSeparator, dirSeparatorAlt));
+            
+            OnStringChange(string.Format("Attempting to evaluate {0}", Filepath), 0, JsonToSimplConstants.StringValueChange);
 
-                var is4Series = (eCrestronSeries.Series4 == (series & eCrestronSeries.Series4));
-                OnBoolChange(is4Series, 0,
-                    JsonToSimplConstants.ProgramCompatibility4SeriesChange);
+            if (string.IsNullOrEmpty(Filepath))
+            {
+                OnStringChange(string.Format("Cannot evaluate file. JSON file path not set"), 0, JsonToSimplConstants.StringValueChange);
+                CrestronConsole.PrintLine("Cannot evaluate file. JSON file path not set");
+                return;
+            }
 
-                var isServer = CrestronEnvironment.DevicePlatform == eDevicePlatform.Server;
-                OnBoolChange(isServer, 0,
-                    JsonToSimplConstants.DevicePlatformValueChange);
+            // get file directory and name to search
+            var fileDirectory = Path.GetDirectoryName(Filepath);
+            var fileName = Path.GetFileName(Filepath);
 
-                // get the roomID
-                var roomId = Crestron.SimplSharp.InitialParametersClass.RoomId;                
-                if (!string.IsNullOrEmpty(roomId))
+            OnStringChange(string.Format("Checking '{0}' for '{1}'", fileDirectory, fileName), 0, JsonToSimplConstants.StringValueChange);
+            Debug.Console(1, "Checking '{0}' for '{1}'", fileDirectory, fileName);
+
+            if (Directory.Exists(fileDirectory))
+            {
+                // get the directory info                    
+                var directoryInfo = new DirectoryInfo(fileDirectory);                                       
+
+                // get the file to be read
+                var actualFile = directoryInfo.GetFiles(fileName).FirstOrDefault();                    
+                if (actualFile == null)
                 {
-                    OnStringChange(roomId, 0, JsonToSimplConstants.RoomIdChange);
-                }
-
-                // get the roomName
-                var roomName = Crestron.SimplSharp.InitialParametersClass.RoomName;
-                if (!string.IsNullOrEmpty(roomName))
-                {
-                    OnStringChange(roomName, 0, JsonToSimplConstants.RoomNameChange);
-                }
-
-                var rootDirectory = Directory.GetApplicationRootDirectory();
-                OnStringChange(rootDirectory, 0, JsonToSimplConstants.RootDirectoryChange);                
-                
-                var splusPath = string.Empty;
-                if (Regex.IsMatch(filepath, @"user", RegexOptions.IgnoreCase))
-                {
-                    if (is4Series) 
-                        splusPath = Regex.Replace(filepath, "user", "user", RegexOptions.IgnoreCase);
-                    else if (isServer)
-                        splusPath = Regex.Replace(filepath, "user", "User", RegexOptions.IgnoreCase);
-                    else
-                        splusPath = filepath;
-                }
-
-                filepath = splusPath.Replace(dirSeparatorAlt, dirSeparator);
-                
-                Filepath = string.Format("{1}{0}{2}", dirSeparator, rootDirectory,
-                    filepath.TrimStart(dirSeparator, dirSeparatorAlt));
-                
-                OnStringChange(string.Format("Attempting to evaluate {0}", Filepath), 0, JsonToSimplConstants.StringValueChange);
-
-                if (string.IsNullOrEmpty(Filepath))
-                {
-                    OnStringChange(string.Format("Cannot evaluate file. JSON file path not set"), 0, JsonToSimplConstants.StringValueChange);
-                    CrestronConsole.PrintLine("Cannot evaluate file. JSON file path not set");
+                    var msg = string.Format("JSON file not found: {0}", Filepath);
+                    OnStringChange(msg, 0, JsonToSimplConstants.StringValueChange);
+                    CrestronConsole.PrintLine(msg);
+                    ErrorLog.Error(msg);
                     return;
                 }
 
-                // get file directory and name to search
-                var fileDirectory = Path.GetDirectoryName(Filepath);
-                var fileName = Path.GetFileName(Filepath);
+                // \xSE\xR\PDT000-Template_Main_Config-Combined_DSP_v00.02.json
+                // \USER\PDT000-Template_Main_Config-Combined_DSP_v00.02.json
+                ActualFilePath = actualFile.FullName;                    
+                OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
+                OnStringChange(string.Format("Actual JSON file is {0}", ActualFilePath), 0, JsonToSimplConstants.StringValueChange);
+                Debug.Console(1, "Actual JSON file is {0}", ActualFilePath);
 
-                OnStringChange(string.Format("Checking '{0}' for '{1}'", fileDirectory, fileName), 0, JsonToSimplConstants.StringValueChange);
-                Debug.Console(1, "Checking '{0}' for '{1}'", fileDirectory, fileName);
-
-                if (Directory.Exists(fileDirectory))
-                {
-                    // get the directory info                    
-                    var directoryInfo = new DirectoryInfo(fileDirectory);                                       
-
-                    // get the file to be read
-                    var actualFile = directoryInfo.GetFiles(fileName).FirstOrDefault();                    
-                    if (actualFile == null)
-                    {
-                        var msg = string.Format("JSON file not found: {0}", Filepath);
-                        OnStringChange(msg, 0, JsonToSimplConstants.StringValueChange);
-                        CrestronConsole.PrintLine(msg);
-                        ErrorLog.Error(msg);
-                        return;
-                    }
-
-                    // \xSE\xR\PDT000-Template_Main_Config-Combined_DSP_v00.02.json
-                    // \USER\PDT000-Template_Main_Config-Combined_DSP_v00.02.json
-                    ActualFilePath = actualFile.FullName;                    
-                    OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
-                    OnStringChange(string.Format("Actual JSON file is {0}", ActualFilePath), 0, JsonToSimplConstants.StringValueChange);
-                    Debug.Console(1, "Actual JSON file is {0}", ActualFilePath);
-
-                    Filename = actualFile.Name;
-                    OnStringChange(Filename, 0, JsonToSimplConstants.FilenameResolvedChange);
-                    OnStringChange(string.Format("JSON Filename is {0}", Filename), 0, JsonToSimplConstants.StringValueChange);
-                    Debug.Console(1, "JSON Filename is {0}", Filename);
+                Filename = actualFile.Name;
+                OnStringChange(Filename, 0, JsonToSimplConstants.FilenameResolvedChange);
+                OnStringChange(string.Format("JSON Filename is {0}", Filename), 0, JsonToSimplConstants.StringValueChange);
+                Debug.Console(1, "JSON Filename is {0}", Filename);
 
 
-                    FilePathName = string.Format(@"{0}{1}", actualFile.DirectoryName, dirSeparator);
-                    OnStringChange(string.Format(@"{0}", actualFile.DirectoryName), 0, JsonToSimplConstants.FilePathResolvedChange);
-                    OnStringChange(string.Format(@"JSON File Path is {0}", actualFile.DirectoryName), 0, JsonToSimplConstants.StringValueChange);
-                    Debug.Console(1, "JSON File Path is {0}", FilePathName);                    
+                FilePathName = string.Format(@"{0}{1}", actualFile.DirectoryName, dirSeparator);
+                OnStringChange(string.Format(@"{0}", actualFile.DirectoryName), 0, JsonToSimplConstants.FilePathResolvedChange);
+                OnStringChange(string.Format(@"JSON File Path is {0}", actualFile.DirectoryName), 0, JsonToSimplConstants.StringValueChange);
+                Debug.Console(1, "JSON File Path is {0}", FilePathName);                    
 
-                    var json = File.ReadToEnd(ActualFilePath, System.Text.Encoding.ASCII);
+                var json = File.ReadToEnd(ActualFilePath, System.Text.Encoding.ASCII);
 
-                    JsonObject = JObject.Parse(json);
-                    foreach (var child in Children)
-                        child.ProcessAll();
+                JsonObject = JObject.Parse(json);
+                foreach (var child in Children)
+                    child.ProcessAll();
 
-                    OnBoolChange(true, 0, JsonToSimplConstants.JsonIsValidBoolChange);
-                }
-                else
-                {
-                    OnStringChange(string.Format("'{0}' not found", fileDirectory), 0, JsonToSimplConstants.StringValueChange);
-                    Debug.Console(1, "'{0}' not found", fileDirectory);
-                }
+                OnBoolChange(true, 0, JsonToSimplConstants.JsonIsValidBoolChange);
             }
-            catch (Exception e)
+            else
             {
-                var msg = string.Format("EvaluateFile Exception: Message\r{0}", e.Message);
-                OnStringChange(msg, 0, JsonToSimplConstants.StringValueChange);
-                CrestronConsole.PrintLine(msg);
-                ErrorLog.Error(msg);
-
-                var stackTrace = string.Format("EvaluateFile: Stack Trace\r{0}", e.StackTrace);
-                OnStringChange(stackTrace, 0, JsonToSimplConstants.StringValueChange);
-                CrestronConsole.PrintLine(stackTrace);
-                ErrorLog.Error(stackTrace);
+                OnStringChange(string.Format("'{0}' not found", fileDirectory), 0, JsonToSimplConstants.StringValueChange);
+                Debug.Console(1, "'{0}' not found", fileDirectory);
             }
         }
-
-
-        /// <summary>
-        /// Sets the debug level
-        /// </summary>
-        /// <param name="level"></param>
-        public void setDebugLevel(uint level)
+        catch (Exception e)
         {
-            Debug.SetDebugLevel(level);
+            var msg = string.Format("EvaluateFile Exception: Message\r{0}", e.Message);
+            OnStringChange(msg, 0, JsonToSimplConstants.StringValueChange);
+            CrestronConsole.PrintLine(msg);
+            ErrorLog.Error(msg);
+
+            var stackTrace = string.Format("EvaluateFile: Stack Trace\r{0}", e.StackTrace);
+            OnStringChange(stackTrace, 0, JsonToSimplConstants.StringValueChange);
+            CrestronConsole.PrintLine(stackTrace);
+            ErrorLog.Error(stackTrace);
+        }
+    }
+
+
+    /// <summary>
+    /// Sets the debug level
+    /// </summary>
+    /// <param name="level"></param>
+    public void setDebugLevel(uint level)
+    {
+        Debug.SetDebugLevel(level);
+    }
+
+    /// <summary>
+    /// Saves the values to the file
+    /// </summary>
+    public override void Save()
+    {
+        // this code is duplicated in the other masters!!!!!!!!!!!!!
+        UnsavedValues = new Dictionary<string, JValue>();
+        // Make each child update their values into master object
+        foreach (var child in Children)
+        {
+            Debug.Console(1, "Master [{0}] checking child [{1}] for updates to save", UniqueID, child.Key);
+            child.UpdateInputsForMaster();
         }
 
-        /// <summary>
-        /// Saves the values to the file
-        /// </summary>
-        public override void Save()
+        if (UnsavedValues == null || UnsavedValues.Count == 0)
         {
-            // this code is duplicated in the other masters!!!!!!!!!!!!!
-            UnsavedValues = new Dictionary<string, JValue>();
-            // Make each child update their values into master object
-            foreach (var child in Children)
+            Debug.Console(1, "Master [{0}] No updated values to save. Skipping", UniqueID);
+            return;
+        }
+        lock (FileLock)
+        {
+            Debug.Console(1, "Saving");
+            foreach (var path in UnsavedValues.Keys)
             {
-                Debug.Console(1, "Master [{0}] checking child [{1}] for updates to save", UniqueID, child.Key);
-                child.UpdateInputsForMaster();
-            }
-
-            if (UnsavedValues == null || UnsavedValues.Count == 0)
-            {
-                Debug.Console(1, "Master [{0}] No updated values to save. Skipping", UniqueID);
-                return;
-            }
-            lock (FileLock)
-            {
-                Debug.Console(1, "Saving");
-                foreach (var path in UnsavedValues.Keys)
-                {
-                    var tokenToReplace = JsonObject.SelectToken(path);
-                    if (tokenToReplace != null)
-                    {// It's found
-                        tokenToReplace.Replace(UnsavedValues[path]);
-                        Debug.Console(1, "JSON Master[{0}] Updating '{1}'", UniqueID, path);
-                    }
-                    else // No token.  Let's make one 
-                    {
-                        //http://stackoverflow.com/questions/17455052/how-to-set-the-value-of-a-json-path-using-json-net
-                        Debug.Console(1, "JSON Master[{0}] Cannot write value onto missing property: '{1}'", UniqueID, path);
-
-                        //                        JContainer jpart = JsonObject;
-                        //                        // walk down the path and find where it goes
-                        //#warning Does not handle arrays.
-                        //                        foreach (var part in path.Split('.'))
-                        //                        {
-
-                        //                            var openPos = part.IndexOf('[');
-                        //                            if (openPos > -1)
-                        //                            {
-                        //                                openPos++; // move to number
-                        //                                var closePos = part.IndexOf(']');
-                        //                                var arrayName = part.Substring(0, openPos - 1); // get the name
-                        //                                var index = Convert.ToInt32(part.Substring(openPos, closePos - openPos));
-
-                        //                                // Check if the array itself exists and add the item if so
-                        //                                if (jpart[arrayName] != null)
-                        //                                {
-                        //                                    var arrayObj = jpart[arrayName] as JArray;
-                        //                                    var item = arrayObj[index];
-                        //                                    if (item == null)
-                        //                                        arrayObj.Add(new JObject());
-                        //                                }
-
-                        //                                Debug.Console(0, "IGNORING MISSING ARRAY VALUE FOR NOW");
-                        //                                continue;
-                        //                            }
-                        //                            // Build the 
-                        //                            if (jpart[part] == null)
-                        //                                jpart.Add(new JProperty(part, new JObject()));
-                        //                            jpart = jpart[part] as JContainer;
-                        //                        }
-                        //                        jpart.Replace(UnsavedValues[path]);
-                    }
+                var tokenToReplace = JsonObject.SelectToken(path);
+                if (tokenToReplace != null)
+                {// It's found
+                    tokenToReplace.Replace(UnsavedValues[path]);
+                    Debug.Console(1, "JSON Master[{0}] Updating '{1}'", UniqueID, path);
                 }
-                using (StreamWriter sw = new StreamWriter(ActualFilePath))
+                else // No token.  Let's make one 
                 {
-                    try
-                    {
-                        sw.Write(JsonObject.ToString());
-                        sw.Flush();
-                    }
-                    catch (Exception e)
-                    {
-                        string err = string.Format("Error writing JSON file:\r{0}", e);
-                        Debug.Console(0, err);
-                        ErrorLog.Warn(err);
-                        return;
-                    }
+                    //http://stackoverflow.com/questions/17455052/how-to-set-the-value-of-a-json-path-using-json-net
+                    Debug.Console(1, "JSON Master[{0}] Cannot write value onto missing property: '{1}'", UniqueID, path);
+
+                    //                        JContainer jpart = JsonObject;
+                    //                        // walk down the path and find where it goes
+                    //#warning Does not handle arrays.
+                    //                        foreach (var part in path.Split('.'))
+                    //                        {
+
+                    //                            var openPos = part.IndexOf('[');
+                    //                            if (openPos > -1)
+                    //                            {
+                    //                                openPos++; // move to number
+                    //                                var closePos = part.IndexOf(']');
+                    //                                var arrayName = part.Substring(0, openPos - 1); // get the name
+                    //                                var index = Convert.ToInt32(part.Substring(openPos, closePos - openPos));
+
+                    //                                // Check if the array itself exists and add the item if so
+                    //                                if (jpart[arrayName] != null)
+                    //                                {
+                    //                                    var arrayObj = jpart[arrayName] as JArray;
+                    //                                    var item = arrayObj[index];
+                    //                                    if (item == null)
+                    //                                        arrayObj.Add(new JObject());
+                    //                                }
+
+                    //                                Debug.Console(0, "IGNORING MISSING ARRAY VALUE FOR NOW");
+                    //                                continue;
+                    //                            }
+                    //                            // Build the 
+                    //                            if (jpart[part] == null)
+                    //                                jpart.Add(new JProperty(part, new JObject()));
+                    //                            jpart = jpart[part] as JContainer;
+                    //                        }
+                    //                        jpart.Replace(UnsavedValues[path]);
+                }
+            }
+            using (StreamWriter sw = new StreamWriter(ActualFilePath))
+            {
+                try
+                {
+                    sw.Write(JsonObject.ToString());
+                    sw.Flush();
+                }
+                catch (Exception e)
+                {
+                    string err = string.Format("Error writing JSON file:\r{0}", e);
+                    Debug.Console(0, err);
+                    ErrorLog.Warn(err);
+                    return;
                 }
             }
         }

src/PepperDash.Core/JsonToSimpl/JsonToSimplFixedPathObject.cs

@@ -1,18 +1,17 @@
 
 
-namespace PepperDash.Core.JsonToSimpl
-{
-    /// <summary>
-    /// 
-    /// </summary>
+namespace PepperDash.Core.JsonToSimpl;
+
+/// <summary>
+/// 
+/// </summary>
 	public class JsonToSimplFixedPathObject : JsonToSimplChildObjectBase
 	{
-        /// <summary>
-        /// Constructor
-        /// </summary>
+    /// <summary>
+    /// Constructor
+    /// </summary>
 		public JsonToSimplFixedPathObject()
 		{
 			this.LinkedToObject = true;
 		}
-	}
-}
+	}

src/PepperDash.Core/JsonToSimpl/JsonToSimplGenericMaster.cs

@@ -3,35 +3,35 @@ using System.Collections.Generic;
 using Crestron.SimplSharp;
 using Newtonsoft.Json.Linq;
 
-namespace PepperDash.Core.JsonToSimpl
-{
-    /// <summary>
-    /// Generic Master
-    /// </summary>
+namespace PepperDash.Core.JsonToSimpl;
+
+/// <summary>
+/// Generic Master
+/// </summary>
 	public class JsonToSimplGenericMaster : JsonToSimplMaster
-    {
+{
 		/*****************************************************************************************/
 		/** Privates **/
 
-        
+    
 		// The JSON file in JObject form
 		// For gathering the incoming data
 		object StringBuilderLock = new object();
 		// To prevent multiple same-file access
 		static object WriteLock = new object();
 
-        /// <summary>
-        /// Callback action for saving
-        /// </summary>
+    /// <summary>
+    /// Callback action for saving
+    /// </summary>
 		public Action<string> SaveCallback { get; set; }
 
 		/*****************************************************************************************/
 
 		/// <summary>
-        /// SIMPL+ default constructor.
-        /// </summary>
+    /// SIMPL+ default constructor.
+    /// </summary>
 		public JsonToSimplGenericMaster()
-        {
+    {
 		}
 
 		/// <summary>
@@ -78,7 +78,7 @@ namespace PepperDash.Core.JsonToSimpl
 		public override void Save()
 		{
 			// this code is duplicated in the other masters!!!!!!!!!!!!!
- 			UnsavedValues = new Dictionary<string, JValue>();
+			UnsavedValues = new Dictionary<string, JValue>();
 			// Make each child update their values into master object
 			foreach (var child in Children)
 			{
@@ -114,5 +114,4 @@ namespace PepperDash.Core.JsonToSimpl
 			else
 				Debug.Console(0, this, "WARNING: No save callback defined.");
 		}
-	}
-}
+	}

src/PepperDash.Core/JsonToSimpl/JsonToSimplMaster.cs

@@ -2,33 +2,32 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace PepperDash.Core.JsonToSimpl
-{
-    /// <summary>
-    /// Abstract base class for JsonToSimpl interactions
-    /// </summary>
+namespace PepperDash.Core.JsonToSimpl;
+
+/// <summary>
+/// Abstract base class for JsonToSimpl interactions
+/// </summary>
 	public abstract class JsonToSimplMaster : IKeyed
 	{
-        /// <summary>
-        /// Notifies of bool change
-        /// </summary>
+    /// <summary>
+    /// Notifies of bool change
+    /// </summary>
 		public event EventHandler<BoolChangeEventArgs> BoolChange;
-        /// <summary>
-        /// Notifies of ushort change
-        /// </summary>
+    /// <summary>
+    /// Notifies of ushort change
+    /// </summary>
 		public event EventHandler<UshrtChangeEventArgs> UshrtChange;
-        /// <summary>
-        /// Notifies of string change
-        /// </summary>
+    /// <summary>
+    /// Notifies of string change
+    /// </summary>
 		public event EventHandler<StringChangeEventArgs> StringChange;
 
-        /// <summary>
-        /// A collection of associated child modules
-        /// </summary>
+    /// <summary>
+    /// A collection of associated child modules
+    /// </summary>
 		protected List<JsonToSimplChildObjectBase> Children = new List<JsonToSimplChildObjectBase>();
 
 		/*****************************************************************************************/
@@ -38,9 +37,9 @@ namespace PepperDash.Core.JsonToSimpl
 		/// </summary>
 		public string Key { get { return UniqueID; } }
 
-        /// <summary>
-        /// A unique ID
-        /// </summary>
+    /// <summary>
+    /// A unique ID
+    /// </summary>
 		public string UniqueID { get; protected set; }
 
 		/// <summary>
@@ -83,9 +82,9 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public JObject JsonObject { get; protected set; }
 
 		/*****************************************************************************************/
@@ -142,9 +141,9 @@ namespace PepperDash.Core.JsonToSimpl
 			//Debug.Console(0, "Master[{0}] Unsaved size={1}", UniqueID, UnsavedValues.Count);
 		}
 
-        /// <summary>
-        /// Saves the file
-        /// </summary>
+    /// <summary>
+    /// Saves the file
+    /// </summary>
 		public abstract void Save();
 
 
@@ -153,18 +152,14 @@ namespace PepperDash.Core.JsonToSimpl
 		/// </summary>
 		public static class JsonFixes
 		{
-            /// <summary>
-            /// Deserializes a string into a JObject
-            /// </summary>
-            /// <param name="json"></param>
-            /// <returns></returns>
+        /// <summary>
+        /// Deserializes a string into a JObject
+        /// </summary>
+        /// <param name="json"></param>
+        /// <returns></returns>
 			public static JObject ParseObject(string json)
 			{
-				#if NET6_0
-                using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
-#else
-                using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json)))
-#endif
+            using (var reader = new JsonTextReader(new StringReader(json)))
 				{
 					var startDepth = reader.Depth;
 					var obj = JObject.Load(reader);
@@ -174,18 +169,15 @@ namespace PepperDash.Core.JsonToSimpl
 				}
 			}
 
-            /// <summary>
-            /// Deserializes a string into a JArray
-            /// </summary>
-            /// <param name="json"></param>
-            /// <returns></returns>
+        /// <summary>
+        /// Deserializes a string into a JArray
+        /// </summary>
+        /// <param name="json"></param>
+        /// <returns></returns>
 			public static JArray ParseArray(string json)
 			{
-				#if NET6_0
-                using (var reader = new JsonTextReader(new System.IO.StringReader(json)))
-#else
-                using (var reader = new JsonTextReader(new Crestron.SimplSharp.CrestronIO.StringReader(json)))
-#endif
+
+            using (var reader = new JsonTextReader(new StringReader(json)))
 				{
 					var startDepth = reader.Depth;
 					var obj = JArray.Load(reader);
@@ -228,12 +220,12 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 
-        /// <summary>
-        /// Helper event
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="index"></param>
-        /// <param name="type"></param>
+    /// <summary>
+    /// Helper event
+    /// </summary>
+    /// <param name="value"></param>
+    /// <param name="index"></param>
+    /// <param name="type"></param>
 		protected void OnStringChange(string value, ushort index, ushort type)
 		{
 			if (StringChange != null)
@@ -244,4 +236,3 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 	}
-}

src/PepperDash.Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs

@@ -6,22 +6,22 @@ using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core.Config;
 
-namespace PepperDash.Core.JsonToSimpl
+namespace PepperDash.Core.JsonToSimpl;
+
+/// <summary>
+/// Portal File Master
+/// </summary>
+public class JsonToSimplPortalFileMaster : JsonToSimplMaster
 {
-    /// <summary>
-    /// Portal File Master
-    /// </summary>
-    public class JsonToSimplPortalFileMaster : JsonToSimplMaster
-    {
 		/// <summary>
 		///  Sets the filepath as well as registers this with the Global.Masters list
 		/// </summary>
 		public string PortalFilepath { get; private set; }
 
-        /// <summary>
-        /// File path of the actual file being read (Portal or local)
-        /// </summary>
-        public string ActualFilePath { get; private set; }
+    /// <summary>
+    /// File path of the actual file being read (Portal or local)
+    /// </summary>
+    public string ActualFilePath { get; private set; }
 
 		/*****************************************************************************************/
 		/** Privates **/
@@ -33,10 +33,10 @@ namespace PepperDash.Core.JsonToSimpl
 		/*****************************************************************************************/
 
 		/// <summary>
-        /// SIMPL+ default constructor.
-        /// </summary>
+    /// SIMPL+ default constructor.
+    /// </summary>
 		public JsonToSimplPortalFileMaster()
-        {
+    {
 		}
 
 		/// <summary>
@@ -64,7 +64,7 @@ namespace PepperDash.Core.JsonToSimpl
 			if (actualLocalFile != null)
 			{
 				ActualFilePath = actualLocalFile.FullName;
-                OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
+            OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
 			}
 			// If the local file does not exist, then read the portal file xyz.json
 			// and create the local.
@@ -78,7 +78,7 @@ namespace PepperDash.Core.JsonToSimpl
 					// got the portal file, hand off to the merge / save method				
 					PortalConfigReader.ReadAndMergeFileIfNecessary(actualPortalFile.FullName, newLocalPath);
 					ActualFilePath = newLocalPath;
-                    OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
+                OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
 				}
 				else
 				{
@@ -188,4 +188,3 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 		}
 	}
-}

src/PepperDash.Core/Logging/CrestronEnricher.cs

@@ -7,31 +7,30 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PepperDash.Core.Logging
+namespace PepperDash.Core.Logging;
+
+public class CrestronEnricher : ILogEventEnricher
 {
-    public class CrestronEnricher : ILogEventEnricher
+    static readonly string _appName;
+
+    static CrestronEnricher()
     {
-        static readonly string _appName;
-
-        static CrestronEnricher()
+        switch (CrestronEnvironment.DevicePlatform)
         {
-            switch (CrestronEnvironment.DevicePlatform)
-            {
-                case eDevicePlatform.Appliance:
-                    _appName = $"App {InitialParametersClass.ApplicationNumber}";
-                    break;
-                case eDevicePlatform.Server:
-                    _appName = $"{InitialParametersClass.RoomId}";
-                    break;
-            }
-        }
-            
-
-        public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
-        {
-            var property = propertyFactory.CreateProperty("App", _appName);
-
-            logEvent.AddOrUpdateProperty(property);
+            case eDevicePlatform.Appliance:
+                _appName = $"App {InitialParametersClass.ApplicationNumber}";
+                break;
+            case eDevicePlatform.Server:
+                _appName = $"{InitialParametersClass.RoomId}";
+                break;
         }
     }
+        
+
+    public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
+    {
+        var property = propertyFactory.CreateProperty("App", _appName);
+
+        logEvent.AddOrUpdateProperty(property);
+    }
 }

src/PepperDash.Core/Logging/DebugConsoleSink.cs

@@ -9,47 +9,45 @@ using System.IO;
 using System.Text;
 
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+public class DebugConsoleSink : ILogEventSink
 {
-    public class DebugConsoleSink : ILogEventSink
+    private readonly ITextFormatter _textFormatter;
+
+    public void Emit(LogEvent logEvent)
     {
-        private readonly ITextFormatter _textFormatter;
+        if (!Debug.IsRunningOnAppliance) return;            
 
-        public void Emit(LogEvent logEvent)
+        /*string message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}]{logEvent.RenderMessage()}";
+
+        if(logEvent.Properties.TryGetValue("Key",out var value) && value is ScalarValue sv && sv.Value is string rawValue)
         {
-            if (!Debug.IsRunningOnAppliance) return;            
+            message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}][{rawValue,3}]: {logEvent.RenderMessage()}";
+        }*/
 
-            /*string message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}]{logEvent.RenderMessage()}";
+        var buffer = new StringWriter(new StringBuilder(256));
 
-            if(logEvent.Properties.TryGetValue("Key",out var value) && value is ScalarValue sv && sv.Value is string rawValue)
-            {
-                message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}][{rawValue,3}]: {logEvent.RenderMessage()}";
-            }*/
+        _textFormatter.Format(logEvent, buffer);
 
-            var buffer = new StringWriter(new StringBuilder(256));
-
-            _textFormatter.Format(logEvent, buffer);
-
-            var message = buffer.ToString();
-
-            CrestronConsole.PrintLine(message);
-        }
-
-        public DebugConsoleSink(ITextFormatter formatProvider )
-        {
-            _textFormatter = formatProvider ?? new JsonFormatter();
-        }
+        var message = buffer.ToString();
 
+        CrestronConsole.PrintLine(message);
     }
 
-    public static class DebugConsoleSinkExtensions
+    public DebugConsoleSink(ITextFormatter formatProvider )
     {
-        public static LoggerConfiguration DebugConsoleSink(
-                             this LoggerSinkConfiguration loggerConfiguration,
-                                              ITextFormatter formatProvider = null)
-        {
-            return loggerConfiguration.Sink(new DebugConsoleSink(formatProvider));
-        }
+        _textFormatter = formatProvider ?? new JsonFormatter();
     }
 
 }
+
+public static class DebugConsoleSinkExtensions
+{
+    public static LoggerConfiguration DebugConsoleSink(
+                         this LoggerSinkConfiguration loggerConfiguration,
+                                          ITextFormatter formatProvider = null)
+    {
+        return loggerConfiguration.Sink(new DebugConsoleSink(formatProvider));
+    }
+}

src/PepperDash.Core/Logging/DebugContext.cs

@@ -6,276 +6,275 @@ using Crestron.SimplSharp.CrestronIO;
 using Newtonsoft.Json;
 
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Represents a debugging context
+/// </summary>
+public class DebugContext
 {
     /// <summary>
-    /// Represents a debugging context
+    /// Describes the folder location where a given program stores it's debug level memory. By default, the
+    /// file written will be named appNdebug where N is 1-10.
     /// </summary>
-    public class DebugContext
+    public string Key { get; private set; }
+
+    ///// <summary>
+    ///// The name of the file containing the current debug settings.
+    ///// </summary>
+    //string FileName = string.Format(@"\nvram\debug\app{0}Debug.json", InitialParametersClass.ApplicationNumber);
+
+    DebugContextSaveData SaveData;
+
+    int SaveTimeoutMs = 30000;
+
+    CTimer SaveTimer;
+
+
+    static List<DebugContext> Contexts = new List<DebugContext>();
+
+    /// <summary>
+    /// Creates or gets a debug context
+    /// </summary>
+    /// <param name="key"></param>
+    /// <returns></returns>
+    public static DebugContext GetDebugContext(string key)
     {
-        /// <summary>
-        /// Describes the folder location where a given program stores it's debug level memory. By default, the
-        /// file written will be named appNdebug where N is 1-10.
-        /// </summary>
-        public string Key { get; private set; }
-
-        ///// <summary>
-        ///// The name of the file containing the current debug settings.
-        ///// </summary>
-        //string FileName = string.Format(@"\nvram\debug\app{0}Debug.json", InitialParametersClass.ApplicationNumber);
-
-        DebugContextSaveData SaveData;
-
-        int SaveTimeoutMs = 30000;
-
-        CTimer SaveTimer;
-
-
-        static List<DebugContext> Contexts = new List<DebugContext>();
-
-        /// <summary>
-        /// Creates or gets a debug context
-        /// </summary>
-        /// <param name="key"></param>
-        /// <returns></returns>
-        public static DebugContext GetDebugContext(string key)
+        var context = Contexts.FirstOrDefault(c => c.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
+        if (context == null)
         {
-            var context = Contexts.FirstOrDefault(c => c.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
-            if (context == null)
-            {
-                context = new DebugContext(key);
-                Contexts.Add(context);
-            }
-            return context;
+            context = new DebugContext(key);
+            Contexts.Add(context);
+        }
+        return context;
+    }
+
+    /// <summary>
+    /// Do not use.  For S+ access.
+    /// </summary>
+    public DebugContext() { }
+
+    DebugContext(string key)
+    {
+        Key = key;
+        if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SimplSharpPro)
+        {
+            // Add command to console
+            CrestronConsole.AddNewConsoleCommand(SetDebugFromConsole, "appdebug",
+                "appdebug:P [0-2]: Sets the application's console debug message level",
+                ConsoleAccessLevelEnum.AccessOperator);
         }
 
-        /// <summary>
-        /// Do not use.  For S+ access.
-        /// </summary>
-        public DebugContext() { }
+        CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
 
-        DebugContext(string key)
+        LoadMemory();
+    }
+
+    /// <summary>
+    /// Used to save memory when shutting down
+    /// </summary>
+    /// <param name="programEventType"></param>
+    void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+    {
+        if (programEventType == eProgramStatusEventType.Stopping)
         {
-            Key = key;
-            if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SimplSharpPro)
+            if (SaveTimer != null)
             {
-                // Add command to console
-                CrestronConsole.AddNewConsoleCommand(SetDebugFromConsole, "appdebug",
-                    "appdebug:P [0-2]: Sets the application's console debug message level",
-                    ConsoleAccessLevelEnum.AccessOperator);
+                SaveTimer.Stop();
+                SaveTimer = null;
+            }
+            Console(0, "Saving debug settings");
+            SaveMemory();
+        }
+    }
+
+    /// <summary>
+    /// Callback for console command
+    /// </summary>
+    /// <param name="levelString"></param>
+    public void SetDebugFromConsole(string levelString)
+    {
+        try
+        {
+            if (string.IsNullOrEmpty(levelString.Trim()))
+            {
+                CrestronConsole.ConsoleCommandResponse("AppDebug level = {0}", SaveData.Level);
+                return;
             }
 
-            CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
-
-            LoadMemory();
+            SetDebugLevel(Convert.ToInt32(levelString));
         }
-
-        /// <summary>
-        /// Used to save memory when shutting down
-        /// </summary>
-        /// <param name="programEventType"></param>
-        void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
+        catch
         {
-            if (programEventType == eProgramStatusEventType.Stopping)
-            {
-                if (SaveTimer != null)
-                {
-                    SaveTimer.Stop();
-                    SaveTimer = null;
-                }
-                Console(0, "Saving debug settings");
-                SaveMemory();
-            }
+            CrestronConsole.PrintLine("Usage: appdebug:P [0-2]");
         }
+    }
 
-        /// <summary>
-        /// Callback for console command
-        /// </summary>
-        /// <param name="levelString"></param>
-        public void SetDebugFromConsole(string levelString)
+    /// <summary>
+    /// Sets the debug level
+    /// </summary>
+    /// <param name="level"> Valid values 0 (no debug), 1 (critical), 2 (all messages)</param>
+    public void SetDebugLevel(int level)
+    {
+        if (level <= 2)
         {
-            try
-            {
-                if (string.IsNullOrEmpty(levelString.Trim()))
-                {
-                    CrestronConsole.ConsoleCommandResponse("AppDebug level = {0}", SaveData.Level);
-                    return;
-                }
+            SaveData.Level = level;
+            SaveMemoryOnTimeout();
 
-                SetDebugLevel(Convert.ToInt32(levelString));
-            }
-            catch
-            {
-                CrestronConsole.PrintLine("Usage: appdebug:P [0-2]");
-            }
+            CrestronConsole.PrintLine("[Application {0}], Debug level set to {1}",
+                InitialParametersClass.ApplicationNumber, SaveData.Level);
         }
+    }
 
-        /// <summary>
-        /// Sets the debug level
-        /// </summary>
-        /// <param name="level"> Valid values 0 (no debug), 1 (critical), 2 (all messages)</param>
-        public void SetDebugLevel(int level)
+    /// <summary>
+    /// Prints message to console if current debug level is equal to or higher than the level of this message.
+    /// Uses CrestronConsole.PrintLine.
+    /// </summary>
+    /// <param name="level"></param>
+    /// <param name="format">Console format string</param>
+    /// <param name="items">Object parameters</param>
+    public void Console(uint level, string format, params object[] items)
+    {
+        if (SaveData.Level >= level)
+            CrestronConsole.PrintLine("App {0}:{1}", InitialParametersClass.ApplicationNumber,
+                string.Format(format, items));
+    }
+
+    /// <summary>
+    /// Appends a device Key to the beginning of a message
+    /// </summary>
+    public void Console(uint level, IKeyed dev, string format, params object[] items)
+    {
+        if (SaveData.Level >= level)
+            Console(level, "[{0}] {1}", dev.Key, string.Format(format, items));
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="level"></param>
+    /// <param name="dev"></param>
+    /// <param name="errorLogLevel"></param>
+    /// <param name="format"></param>
+    /// <param name="items"></param>
+    public void Console(uint level, IKeyed dev, Debug.ErrorLogLevel errorLogLevel,
+        string format, params object[] items)
+    {
+        if (SaveData.Level >= level)
         {
-            if (level <= 2)
-            {
-                SaveData.Level = level;
-                SaveMemoryOnTimeout();
-
-                CrestronConsole.PrintLine("[Application {0}], Debug level set to {1}",
-                    InitialParametersClass.ApplicationNumber, SaveData.Level);
-            }
-        }
-
-        /// <summary>
-        /// Prints message to console if current debug level is equal to or higher than the level of this message.
-        /// Uses CrestronConsole.PrintLine.
-        /// </summary>
-        /// <param name="level"></param>
-        /// <param name="format">Console format string</param>
-        /// <param name="items">Object parameters</param>
-        public void Console(uint level, string format, params object[] items)
-        {
-            if (SaveData.Level >= level)
-                CrestronConsole.PrintLine("App {0}:{1}", InitialParametersClass.ApplicationNumber,
-                    string.Format(format, items));
-        }
-
-        /// <summary>
-        /// Appends a device Key to the beginning of a message
-        /// </summary>
-        public void Console(uint level, IKeyed dev, string format, params object[] items)
-        {
-            if (SaveData.Level >= level)
-                Console(level, "[{0}] {1}", dev.Key, string.Format(format, items));
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="level"></param>
-        /// <param name="dev"></param>
-        /// <param name="errorLogLevel"></param>
-        /// <param name="format"></param>
-        /// <param name="items"></param>
-        public void Console(uint level, IKeyed dev, Debug.ErrorLogLevel errorLogLevel,
-            string format, params object[] items)
-        {
-            if (SaveData.Level >= level)
-            {
-                var str = string.Format("[{0}] {1}", dev.Key, string.Format(format, items));
-                Console(level, str);
-                LogError(errorLogLevel, str);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="level"></param>
-        /// <param name="errorLogLevel"></param>
-        /// <param name="format"></param>
-        /// <param name="items"></param>
-        public void Console(uint level, Debug.ErrorLogLevel errorLogLevel,
-            string format, params object[] items)
-        {
-            if (SaveData.Level >= level)
-            {
-                var str = string.Format(format, items);
-                Console(level, str);
-                LogError(errorLogLevel, str);
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="errorLogLevel"></param>
-        /// <param name="str"></param>
-        public void LogError(Debug.ErrorLogLevel errorLogLevel, string str)
-        {
-            string msg = string.Format("App {0}:{1}", InitialParametersClass.ApplicationNumber, str);
-            switch (errorLogLevel)
-            {
-                case Debug.ErrorLogLevel.Error:
-                    ErrorLog.Error(msg);
-                    break;
-                case Debug.ErrorLogLevel.Warning:
-                    ErrorLog.Warn(msg);
-                    break;
-                case Debug.ErrorLogLevel.Notice:
-                    ErrorLog.Notice(msg);
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Writes the memory object after timeout
-        /// </summary>
-        void SaveMemoryOnTimeout()
-        {
-            if (SaveTimer == null)
-                SaveTimer = new CTimer(o =>
-                {
-                    SaveTimer = null;
-                    SaveMemory();
-                }, SaveTimeoutMs);
-            else
-                SaveTimer.Reset(SaveTimeoutMs);
-        }
-
-        /// <summary>
-        /// Writes the memory - use SaveMemoryOnTimeout
-        /// </summary>
-        void SaveMemory()
-        {
-            using (StreamWriter sw = new StreamWriter(GetMemoryFileName()))
-            {
-                var json = JsonConvert.SerializeObject(SaveData);
-                sw.Write(json);
-                sw.Flush();
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        void LoadMemory()
-        {
-            var file = GetMemoryFileName();
-            if (File.Exists(file))
-            {
-                using (StreamReader sr = new StreamReader(file))
-                {
-                    var data = JsonConvert.DeserializeObject<DebugContextSaveData>(sr.ReadToEnd());
-                    if (data != null)
-                    {
-                        SaveData = data;
-                        Debug.Console(1, "Debug memory restored from file");
-                        return;
-                    }
-                    else
-                        SaveData = new DebugContextSaveData();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Helper to get the file path for this app's debug memory
-        /// </summary>
-        string GetMemoryFileName()
-        {
-            return string.Format(@"\NVRAM\debugSettings\program{0}-{1}", InitialParametersClass.ApplicationNumber, Key);
+            var str = string.Format("[{0}] {1}", dev.Key, string.Format(format, items));
+            Console(level, str);
+            LogError(errorLogLevel, str);
         }
     }
 
     /// <summary>
     /// 
     /// </summary>
-    public class DebugContextSaveData
+    /// <param name="level"></param>
+    /// <param name="errorLogLevel"></param>
+    /// <param name="format"></param>
+    /// <param name="items"></param>
+    public void Console(uint level, Debug.ErrorLogLevel errorLogLevel,
+        string format, params object[] items)
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        public int Level { get; set; }
+        if (SaveData.Level >= level)
+        {
+            var str = string.Format(format, items);
+            Console(level, str);
+            LogError(errorLogLevel, str);
+        }
     }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="errorLogLevel"></param>
+    /// <param name="str"></param>
+    public void LogError(Debug.ErrorLogLevel errorLogLevel, string str)
+    {
+        string msg = string.Format("App {0}:{1}", InitialParametersClass.ApplicationNumber, str);
+        switch (errorLogLevel)
+        {
+            case Debug.ErrorLogLevel.Error:
+                ErrorLog.Error(msg);
+                break;
+            case Debug.ErrorLogLevel.Warning:
+                ErrorLog.Warn(msg);
+                break;
+            case Debug.ErrorLogLevel.Notice:
+                ErrorLog.Notice(msg);
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Writes the memory object after timeout
+    /// </summary>
+    void SaveMemoryOnTimeout()
+    {
+        if (SaveTimer == null)
+            SaveTimer = new CTimer(o =>
+            {
+                SaveTimer = null;
+                SaveMemory();
+            }, SaveTimeoutMs);
+        else
+            SaveTimer.Reset(SaveTimeoutMs);
+    }
+
+    /// <summary>
+    /// Writes the memory - use SaveMemoryOnTimeout
+    /// </summary>
+    void SaveMemory()
+    {
+        using (StreamWriter sw = new StreamWriter(GetMemoryFileName()))
+        {
+            var json = JsonConvert.SerializeObject(SaveData);
+            sw.Write(json);
+            sw.Flush();
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    void LoadMemory()
+    {
+        var file = GetMemoryFileName();
+        if (File.Exists(file))
+        {
+            using (StreamReader sr = new StreamReader(file))
+            {
+                var data = JsonConvert.DeserializeObject<DebugContextSaveData>(sr.ReadToEnd());
+                if (data != null)
+                {
+                    SaveData = data;
+                    Debug.Console(1, "Debug memory restored from file");
+                    return;
+                }
+                else
+                    SaveData = new DebugContextSaveData();
+            }
+        }
+    }
+
+    /// <summary>
+    /// Helper to get the file path for this app's debug memory
+    /// </summary>
+    string GetMemoryFileName()
+    {
+        return string.Format(@"\NVRAM\debugSettings\program{0}-{1}", InitialParametersClass.ApplicationNumber, Key);
+    }
+}
+
+/// <summary>
+/// 
+/// </summary>
+public class DebugContextSaveData
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public int Level { get; set; }
 }

src/PepperDash.Core/Logging/DebugCrestronLoggerSink.cs

@@ -3,27 +3,26 @@ using Crestron.SimplSharp.CrestronLogger;
 using Serilog.Core;
 using Serilog.Events;
 
-namespace PepperDash.Core.Logging
+namespace PepperDash.Core.Logging;
+
+public class DebugCrestronLoggerSink : ILogEventSink
 {
-    public class DebugCrestronLoggerSink : ILogEventSink
+    public void Emit(LogEvent logEvent)
     {
-        public void Emit(LogEvent logEvent)
+        if (!Debug.IsRunningOnAppliance) return;
+
+        string message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}]{logEvent.RenderMessage()}";
+
+        if (logEvent.Properties.TryGetValue("Key", out var value) && value is ScalarValue sv && sv.Value is string rawValue)
         {
-            if (!Debug.IsRunningOnAppliance) return;
-
-            string message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}]{logEvent.RenderMessage()}";
-
-            if (logEvent.Properties.TryGetValue("Key", out var value) && value is ScalarValue sv && sv.Value is string rawValue)
-            {
-                message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}][{rawValue}]: {logEvent.RenderMessage()}";
-            }
-
-            CrestronLogger.WriteToLog(message, (uint)logEvent.Level);
+            message = $"[{logEvent.Timestamp}][{logEvent.Level}][App {InitialParametersClass.ApplicationNumber}][{rawValue}]: {logEvent.RenderMessage()}";
         }
 
-        public DebugCrestronLoggerSink()
-        {
-            CrestronLogger.Initialize(1, LoggerModeEnum.RM);
-        }
+        CrestronLogger.WriteToLog(message, (uint)logEvent.Level);
+    }
+
+    public DebugCrestronLoggerSink()
+    {
+        CrestronLogger.Initialize(1, LoggerModeEnum.RM);
     }
 }

src/PepperDash.Core/Logging/DebugErrorLogSink.cs

@@ -9,57 +9,56 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace PepperDash.Core.Logging
+namespace PepperDash.Core.Logging;
+
+public class DebugErrorLogSink : ILogEventSink
 {
-    public class DebugErrorLogSink : ILogEventSink
+    private ITextFormatter _formatter;
+
+    private Dictionary<LogEventLevel, Action<string>> _errorLogMap = new Dictionary<LogEventLevel, Action<string>>
     {
-        private ITextFormatter _formatter;
+        { LogEventLevel.Verbose, (msg) => ErrorLog.Notice(msg) },
+        {LogEventLevel.Debug, (msg) => ErrorLog.Notice(msg) },
+        {LogEventLevel.Information, (msg) => ErrorLog.Notice(msg) },
+        {LogEventLevel.Warning, (msg) => ErrorLog.Warn(msg) },
+        {LogEventLevel.Error, (msg) => ErrorLog.Error(msg) },
+        {LogEventLevel.Fatal, (msg) => ErrorLog.Error(msg) }
+    };
+    public void Emit(LogEvent logEvent)
+    {
+        string message;
 
-        private Dictionary<LogEventLevel, Action<string>> _errorLogMap = new Dictionary<LogEventLevel, Action<string>>
+        if (_formatter == null)
         {
-            { LogEventLevel.Verbose, (msg) => ErrorLog.Notice(msg) },
-            {LogEventLevel.Debug, (msg) => ErrorLog.Notice(msg) },
-            {LogEventLevel.Information, (msg) => ErrorLog.Notice(msg) },
-            {LogEventLevel.Warning, (msg) => ErrorLog.Warn(msg) },
-            {LogEventLevel.Error, (msg) => ErrorLog.Error(msg) },
-            {LogEventLevel.Fatal, (msg) => ErrorLog.Error(msg) }
-        };
-        public void Emit(LogEvent logEvent)
+            var programId = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance
+                ? $"App {InitialParametersClass.ApplicationNumber}"
+                : $"Room {InitialParametersClass.RoomId}";
+
+            message = $"[{logEvent.Timestamp}][{logEvent.Level}][{programId}]{logEvent.RenderMessage()}";
+
+            if (logEvent.Properties.TryGetValue("Key", out var value) && value is ScalarValue sv && sv.Value is string rawValue)
+            {
+                message = $"[{logEvent.Timestamp}][{logEvent.Level}][{programId}][{rawValue}]: {logEvent.RenderMessage()}";
+            }
+        } else
         {
-            string message;
+            var buffer = new StringWriter(new StringBuilder(256));
 
-            if (_formatter == null)
-            {
-                var programId = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance
-                    ? $"App {InitialParametersClass.ApplicationNumber}"
-                    : $"Room {InitialParametersClass.RoomId}";
+            _formatter.Format(logEvent, buffer);
 
-                message = $"[{logEvent.Timestamp}][{logEvent.Level}][{programId}]{logEvent.RenderMessage()}";
-
-                if (logEvent.Properties.TryGetValue("Key", out var value) && value is ScalarValue sv && sv.Value is string rawValue)
-                {
-                    message = $"[{logEvent.Timestamp}][{logEvent.Level}][{programId}][{rawValue}]: {logEvent.RenderMessage()}";
-                }
-            } else
-            {
-                var buffer = new StringWriter(new StringBuilder(256));
-
-                _formatter.Format(logEvent, buffer);
-
-                message = buffer.ToString();
-            }
-
-            if(!_errorLogMap.TryGetValue(logEvent.Level, out var handler))
-            {
-                return;
-            }
-
-            handler(message);
+            message = buffer.ToString();
         }
 
-        public DebugErrorLogSink(ITextFormatter formatter = null)
+        if(!_errorLogMap.TryGetValue(logEvent.Level, out var handler))
         {
-            _formatter = formatter;
+            return;
         }
+
+        handler(message);
+    }
+
+    public DebugErrorLogSink(ITextFormatter formatter = null)
+    {
+        _formatter = formatter;
     }
 }

src/PepperDash.Core/Logging/DebugExtensions.cs

@@ -2,73 +2,72 @@
 using System;
 using Log = PepperDash.Core.Debug;
 
-namespace PepperDash.Core.Logging
+namespace PepperDash.Core.Logging;
+
+public static class DebugExtensions
 {
-    public static class DebugExtensions
+    public static void LogException(this IKeyed device, Exception ex, string message, params object[] args)
     {
-        public static void LogException(this IKeyed device, Exception ex, string message, params object[] args)
-        {
-            Log.LogMessage(ex, message, device, args);
-        }
+        Log.LogMessage(ex, message, device, args);
+    }
 
-        public static void LogVerbose(this IKeyed device, Exception ex, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Verbose, ex, message, device, args);
-        }
+    public static void LogVerbose(this IKeyed device, Exception ex, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Verbose, ex, message, device, args);
+    }
 
-        public static void LogVerbose(this IKeyed device, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Verbose, device, message, args);
-        }
+    public static void LogVerbose(this IKeyed device, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Verbose, device, message, args);
+    }
 
-        public static void LogDebug(this IKeyed device, Exception ex, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Debug, ex, message, device, args);
-        }
+    public static void LogDebug(this IKeyed device, Exception ex, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Debug, ex, message, device, args);
+    }
 
-        public static void LogDebug(this IKeyed device, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Debug, device, message, args);
-        }
+    public static void LogDebug(this IKeyed device, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Debug, device, message, args);
+    }
 
-        public static void LogInformation(this IKeyed device, Exception ex, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Information, ex, message, device, args);
-        }
+    public static void LogInformation(this IKeyed device, Exception ex, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Information, ex, message, device, args);
+    }
 
-        public static void LogInformation(this IKeyed device, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Information, device, message, args);
-        }
+    public static void LogInformation(this IKeyed device, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Information, device, message, args);
+    }
 
-        public static void LogWarning(this IKeyed device, Exception ex, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Warning, ex, message, device, args);
-        }
+    public static void LogWarning(this IKeyed device, Exception ex, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Warning, ex, message, device, args);
+    }
 
-        public static void LogWarning(this IKeyed device, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Warning, device, message, args);
-        }
+    public static void LogWarning(this IKeyed device, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Warning, device, message, args);
+    }
 
-        public static void LogError(this IKeyed device, Exception ex, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Error, ex, message, device, args);
-        }
+    public static void LogError(this IKeyed device, Exception ex, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Error, ex, message, device, args);
+    }
 
-        public static void LogError(this IKeyed device, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Error, device, message, args);
-        }
+    public static void LogError(this IKeyed device, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Error, device, message, args);
+    }
 
-        public static void LogFatal(this IKeyed device, Exception ex, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Fatal, ex, message, device, args);
-        }
+    public static void LogFatal(this IKeyed device, Exception ex, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Fatal, ex, message, device, args);
+    }
 
-        public static void LogFatal(this IKeyed device, string message, params object[] args)
-        {
-            Log.LogMessage(LogEventLevel.Fatal, device, message, args);
-        }
+    public static void LogFatal(this IKeyed device, string message, params object[] args)
+    {
+        Log.LogMessage(LogEventLevel.Fatal, device, message, args);
     }
 }

src/PepperDash.Core/Logging/DebugMemory.cs

@@ -2,25 +2,25 @@
 using Crestron.SimplSharp;
 using Newtonsoft.Json;
 
-namespace PepperDash.Core.Logging
-{
-    /// <summary>
-    /// Class to persist current Debug settings across program restarts
-    /// </summary>
+namespace PepperDash.Core.Logging;
+
+/// <summary>
+/// Class to persist current Debug settings across program restarts
+/// </summary>
 	public class DebugContextCollection
 	{
-        /// <summary>
-        /// To prevent threading issues with the DeviceDebugSettings collection
-        /// </summary>
-        private readonly CCriticalSection _deviceDebugSettingsLock;
+    /// <summary>
+    /// To prevent threading issues with the DeviceDebugSettings collection
+    /// </summary>
+    private readonly CCriticalSection _deviceDebugSettingsLock;
 
 		[JsonProperty("items")] private readonly Dictionary<string, DebugContextItem> _items;
 
-        /// <summary>
-        /// Collection of the debug settings for each device where the dictionary key is the device key
-        /// </summary>
-        [JsonProperty("deviceDebugSettings")]
-        private Dictionary<string, object> DeviceDebugSettings { get; set; }
+    /// <summary>
+    /// Collection of the debug settings for each device where the dictionary key is the device key
+    /// </summary>
+    [JsonProperty("deviceDebugSettings")]
+    private Dictionary<string, object> DeviceDebugSettings { get; set; }
 
 
 		/// <summary>
@@ -28,8 +28,8 @@ namespace PepperDash.Core.Logging
 		/// </summary>
 		public DebugContextCollection()
 		{
-            _deviceDebugSettingsLock = new CCriticalSection();
-            DeviceDebugSettings = new Dictionary<string, object>();
+        _deviceDebugSettingsLock = new CCriticalSection();
+        DeviceDebugSettings = new Dictionary<string, object>();
 			_items = new Dictionary<string, DebugContextItem>();
 		}
 
@@ -59,40 +59,40 @@ namespace PepperDash.Core.Logging
 		}
 
 
-        /// <summary>
-        /// sets the settings for a device or creates a new entry
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <param name="settings"></param>
-        /// <returns></returns>
-        public void SetDebugSettingsForKey(string deviceKey, object settings)
+    /// <summary>
+    /// sets the settings for a device or creates a new entry
+    /// </summary>
+    /// <param name="deviceKey"></param>
+    /// <param name="settings"></param>
+    /// <returns></returns>
+    public void SetDebugSettingsForKey(string deviceKey, object settings)
+    {
+        try
         {
-            try
-            {
-                _deviceDebugSettingsLock.Enter();
+            _deviceDebugSettingsLock.Enter();
 
-                if (DeviceDebugSettings.ContainsKey(deviceKey))
-                {
-                    DeviceDebugSettings[deviceKey] = settings;
-                }
-                else
-                    DeviceDebugSettings.Add(deviceKey, settings);
-            }
-            finally
+            if (DeviceDebugSettings.ContainsKey(deviceKey))
             {
-                _deviceDebugSettingsLock.Leave();
+                DeviceDebugSettings[deviceKey] = settings;
             }
+            else
+                DeviceDebugSettings.Add(deviceKey, settings);
         }
-
-        /// <summary>
-        /// Gets the device settings for a device by key or returns null
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <returns></returns>
-        public object GetDebugSettingsForKey(string deviceKey)
+        finally
         {
-            return DeviceDebugSettings[deviceKey];
+            _deviceDebugSettingsLock.Leave();
         }
+    }
+
+    /// <summary>
+    /// Gets the device settings for a device by key or returns null
+    /// </summary>
+    /// <param name="deviceKey"></param>
+    /// <returns></returns>
+    public object GetDebugSettingsForKey(string deviceKey)
+    {
+        return DeviceDebugSettings[deviceKey];
+    }
 	}
 
 	/// <summary>
@@ -100,16 +100,15 @@ namespace PepperDash.Core.Logging
 	/// </summary>
 	public class DebugContextItem
 	{
-        /// <summary>
-        /// The level of debug messages to print
-        /// </summary>
+    /// <summary>
+    /// The level of debug messages to print
+    /// </summary>
 		[JsonProperty("level")]
 		public int Level { get; set; }
 
-        /// <summary>
-        /// Property to tell the program not to intitialize when it boots, if desired
-        /// </summary>
-        [JsonProperty("doNotLoadOnNextBoot")]
-        public bool DoNotLoadOnNextBoot { get; set; }
-	}
-}
+    /// <summary>
+    /// Property to tell the program not to intitialize when it boots, if desired
+    /// </summary>
+    [JsonProperty("doNotLoadOnNextBoot")]
+    public bool DoNotLoadOnNextBoot { get; set; }
+	}

src/PepperDash.Core/Logging/DebugWebsocketSink.cs

@@ -1,271 +1,332 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Crestron.SimplSharp;
+using Org.BouncyCastle.Asn1.X509;
 using Serilog;
+using Serilog.Configuration;
 using Serilog.Core;
 using Serilog.Events;
-using Serilog.Configuration;
-using WebSocketSharp.Server;
-using Crestron.SimplSharp;
-using WebSocketSharp;
-using System.Security.Authentication;
-using WebSocketSharp.Net;
-using X509Certificate2 = System.Security.Cryptography.X509Certificates.X509Certificate2;
-using System.IO;
-using Org.BouncyCastle.Asn1.X509;
 using Serilog.Formatting;
-using Newtonsoft.Json.Linq;
 using Serilog.Formatting.Json;
+using System;
+using System.IO;
+using System.Security.Authentication;
+using WebSocketSharp;
+using WebSocketSharp.Server;
+using X509Certificate2 = System.Security.Cryptography.X509Certificates.X509Certificate2;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Provides a WebSocket-based logging sink for debugging purposes, allowing log events to be broadcast to connected
+/// WebSocket clients.
+/// </summary>
+/// <remarks>This class implements the <see cref="ILogEventSink"/> interface and is designed to send
+/// formatted log events to WebSocket clients connected to a secure WebSocket server. The server is hosted locally
+/// and uses a self-signed certificate for SSL/TLS encryption.</remarks>
+public class DebugWebsocketSink : ILogEventSink, IKeyed
 {
-    public class DebugWebsocketSink : ILogEventSink
-    {
-        private HttpServer _httpsServer;
-        
-        private string _path = "/debug/join/";
-        private const string _certificateName = "selfCres";
-        private const string _certificatePassword = "cres12345";
+    private HttpServer _httpsServer;
+    
+    private readonly string _path = "/debug/join/";
+    private const string _certificateName = "selfCres";
+    private const string _certificatePassword = "cres12345";
 
-        public int Port 
-        { get 
-            { 
+    /// <summary>
+    /// Gets the port number on which the HTTPS server is currently running.
+    /// </summary>
+    public int Port 
+    { get 
+        { 
+            
+            if(_httpsServer == null) return 0;
+            return _httpsServer.Port;
+        } 
+    }
+
+    /// <summary>
+    /// Gets the WebSocket URL for the current server instance.
+    /// </summary>
+    /// <remarks>The URL is dynamically constructed based on the server's current IP address, port,
+    /// and WebSocket path.</remarks>
+    public string Url
+    {
+        get
+        {
+            if (_httpsServer == null) return "";
+            return $"wss://{CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0)}:{_httpsServer.Port}{_httpsServer.WebSocketServices[_path].Path}";
+        }
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether the HTTPS server is currently listening for incoming connections.
+    /// </summary>
+    public bool IsRunning { get => _httpsServer?.IsListening ?? false; }        
+
+    /// <inheritdoc/>
+    public string Key => "DebugWebsocketSink";
+
+    private readonly ITextFormatter _textFormatter;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DebugWebsocketSink"/> class with the specified text formatter.
+    /// </summary>
+    /// <remarks>This constructor initializes the WebSocket sink and ensures that a certificate is
+    /// available for secure communication. If the required certificate does not exist, it will be created
+    /// automatically. Additionally, the sink is configured to stop the server when the program is
+    /// stopping.</remarks>
+    /// <param name="formatProvider">The text formatter used to format log messages. If null, a default JSON formatter is used.</param>
+    public DebugWebsocketSink(ITextFormatter formatProvider)
+    {
+
+        _textFormatter = formatProvider ?? new JsonFormatter();
+
+        if (!File.Exists($"\\user\\{_certificateName}.pfx"))
+            CreateCert();
+
+        CrestronEnvironment.ProgramStatusEventHandler += type =>
+        {
+            if (type == eProgramStatusEventType.Stopping)
+            {
+                StopServer();
+            }
+        };
+    }
+
+    private static void CreateCert()
+    {
+        try
+        {               
+            var utility = new BouncyCertificate();
+            
+            var ipAddress = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0);
+            var hostName = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, 0);
+            var domainName = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DOMAIN_NAME, 0);
+
+            CrestronConsole.PrintLine(string.Format("DomainName: {0} | HostName: {1} | {1}.{0}@{2}", domainName, hostName, ipAddress));
+
+            var certificate = utility.CreateSelfSignedCertificate(string.Format("CN={0}.{1}", hostName, domainName), [string.Format("{0}.{1}", hostName, domainName), ipAddress], [KeyPurposeID.id_kp_serverAuth, KeyPurposeID.id_kp_clientAuth]);
+
+            //Crestron fails to let us do this...perhaps it should be done through their Dll's but haven't tested               
+
+            var separator = Path.DirectorySeparatorChar;
+                            
+            utility.CertificatePassword = _certificatePassword;
+            utility.WriteCertificate(certificate, @$"{separator}user{separator}", _certificateName);               
+        }
+        catch (Exception ex)
+        {
+            //Debug.Console(0, "WSS CreateCert Failed\r\n{0}\r\n{1}", ex.Message, ex.StackTrace);
+            CrestronConsole.PrintLine("WSS CreateCert Failed\r\n{0}\r\n{1}", ex.Message, ex.StackTrace);
+        }
+    }
+
+    /// <summary>
+    /// Sends a log event to all connected WebSocket clients.
+    /// </summary>
+    /// <remarks>The log event is formatted using the configured text formatter and then broadcasted  
+    /// to all clients connected to the WebSocket server. If the WebSocket server is not          initialized or not
+    /// listening, the method exits without performing any action.</remarks>
+    /// <param name="logEvent">The log event to be formatted and broadcasted. Cannot be null.</param>
+    public void Emit(LogEvent logEvent)
+    {
+        if (_httpsServer == null || !_httpsServer.IsListening) return;
+
+        var sw = new StringWriter();
+        _textFormatter.Format(logEvent, sw);
+
+        _httpsServer.WebSocketServices[_path].Sessions.Broadcast(sw.ToString());           
+    }
+
+    /// <summary>
+    /// Starts the WebSocket server on the specified port and configures it with the appropriate certificate.
+    /// </summary>
+    /// <remarks>This method initializes the WebSocket server and binds it to the specified port.  It
+    /// also applies the server's certificate for secure communication. Ensure that the port is not already in use
+    /// and that the certificate file is accessible.</remarks>
+    /// <param name="port">The port number on which the WebSocket server will listen. Must be a valid, non-negative port number.</param>
+    public void StartServerAndSetPort(int port)
+    {
+        Debug.Console(0, "Starting Websocket Server on port: {0}", port);
+
+
+        Start(port, $"\\user\\{_certificateName}.pfx", _certificatePassword);
+    }
+
+    private void Start(int port, string certPath = "", string certPassword = "")
+    {
+        try
+        {
+            _httpsServer = new HttpServer(port, true);                
+
+            if (!string.IsNullOrWhiteSpace(certPath))
+            {
+                Debug.Console(0, "Assigning SSL Configuration");
+
+                _httpsServer.SslConfiguration.ServerCertificate = new X509Certificate2(certPath, certPassword);
+                _httpsServer.SslConfiguration.ClientCertificateRequired = false;
+                _httpsServer.SslConfiguration.CheckCertificateRevocation = false;
+                _httpsServer.SslConfiguration.EnabledSslProtocols = SslProtocols.Tls12;
+                //this is just to test, you might want to actually validate
+                _httpsServer.SslConfiguration.ClientCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) =>
+                    {
+                        Debug.Console(0, "HTTPS ClientCerticateValidation Callback triggered");
+                        return true;
+                    };
+            }
+            Debug.Console(0, "Adding Debug Client Service");
+            _httpsServer.AddWebSocketService<DebugClient>(_path);
+            Debug.Console(0, "Assigning Log Info");
+            _httpsServer.Log.Level = LogLevel.Trace;
+            _httpsServer.Log.Output = (d, s) =>
+            {
+                uint level;
+
+                switch(d.Level)
+                {
+                    case WebSocketSharp.LogLevel.Fatal:
+                        level = 3;
+                        break;
+                    case WebSocketSharp.LogLevel.Error:
+                        level = 2;
+                        break;
+                    case WebSocketSharp.LogLevel.Warn:
+                        level = 1;
+                        break;
+                    case WebSocketSharp.LogLevel.Info:
+                        level = 0;
+                        break;
+                    case WebSocketSharp.LogLevel.Debug:
+                        level = 4;
+                        break;
+                    case WebSocketSharp.LogLevel.Trace:
+                        level = 5;
+                        break;
+                    default:
+                        level = 4;
+                        break;
+                }
                 
-                if(_httpsServer == null) return 0;
-                return _httpsServer.Port;
-            } 
-        }
-
-        public string Url
-        {
-            get
-            {
-                if (_httpsServer == null) return "";
-                return $"wss://{CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0)}:{_httpsServer.Port}{_httpsServer.WebSocketServices[_path].Path}";
-            }
-        }
-
-        public bool IsRunning { get => _httpsServer?.IsListening ?? false; }
-        
-
-        private readonly ITextFormatter _textFormatter;
-
-        public DebugWebsocketSink(ITextFormatter formatProvider)
-        {
-
-            _textFormatter = formatProvider ?? new JsonFormatter();
-
-            if (!File.Exists($"\\user\\{_certificateName}.pfx"))
-                CreateCert(null);
-
-            CrestronEnvironment.ProgramStatusEventHandler += type =>
-            {
-                if (type == eProgramStatusEventType.Stopping)
-                {
-                    StopServer();
-                }
+                Debug.Console(level, "{1} {0}\rCaller:{2}\rMessage:{3}\rs:{4}", d.Level.ToString(), d.Date.ToString(), d.Caller.ToString(), d.Message, s);
             };
+            Debug.Console(0, "Starting");
+
+            _httpsServer.Start();
+            Debug.Console(0, "Ready");
         }
-
-        private void CreateCert(string[] args)
+        catch (Exception ex)
         {
-            try
-            {
-                //Debug.Console(0,"CreateCert Creating Utility");
-                CrestronConsole.PrintLine("CreateCert Creating Utility");
-                //var utility = new CertificateUtility();
-                var utility = new BouncyCertificate();
-                //Debug.Console(0, "CreateCert Calling CreateCert");
-                CrestronConsole.PrintLine("CreateCert Calling CreateCert");
-                //utility.CreateCert();
-                var ipAddress = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0);
-                var hostName = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, 0);
-                var domainName = CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_DOMAIN_NAME, 0);
-
-                //Debug.Console(0, "DomainName: {0} | HostName: {1} | {1}.{0}@{2}", domainName, hostName, ipAddress);
-                CrestronConsole.PrintLine(string.Format("DomainName: {0} | HostName: {1} | {1}.{0}@{2}", domainName, hostName, ipAddress));
-
-                var certificate = utility.CreateSelfSignedCertificate(string.Format("CN={0}.{1}", hostName, domainName), new[] { string.Format("{0}.{1}", hostName, domainName), ipAddress }, new[] { KeyPurposeID.id_kp_serverAuth, KeyPurposeID.id_kp_clientAuth });
-                //Crestron fails to let us do this...perhaps it should be done through their Dll's but haven't tested
-                //Debug.Print($"CreateCert Storing Certificate To My.LocalMachine");
-                //utility.AddCertToStore(certificate, StoreName.My, StoreLocation.LocalMachine);
-                //Debug.Console(0, "CreateCert Saving Cert to \\user\\");
-                CrestronConsole.PrintLine("CreateCert Saving Cert to \\user\\");
-                utility.CertificatePassword = _certificatePassword;
-                utility.WriteCertificate(certificate, @"\user\", _certificateName);
-                //Debug.Console(0, "CreateCert Ending CreateCert");
-                CrestronConsole.PrintLine("CreateCert Ending CreateCert");
-            }
-            catch (Exception ex)
-            {
-                //Debug.Console(0, "WSS CreateCert Failed\r\n{0}\r\n{1}", ex.Message, ex.StackTrace);
-                CrestronConsole.PrintLine(string.Format("WSS CreateCert Failed\r\n{0}\r\n{1}", ex.Message, ex.StackTrace));
-            }
-        }
-
-        public void Emit(LogEvent logEvent)
-        {
-            if (_httpsServer == null || !_httpsServer.IsListening) return;
-
-            var sw = new StringWriter();
-            _textFormatter.Format(logEvent, sw);
-
-            _httpsServer.WebSocketServices.Broadcast(sw.ToString());
-
-        }
-
-        public void StartServerAndSetPort(int port)
-        {
-            Debug.Console(0, "Starting Websocket Server on port: {0}", port);
-
-
-            Start(port, $"\\user\\{_certificateName}.pfx", _certificatePassword);
-        }
-
-        private void Start(int port, string certPath = "", string certPassword = "")
-        {
-            try
-            {
-                _httpsServer = new HttpServer(port, true);
-
-
-                if (!string.IsNullOrWhiteSpace(certPath))
-                {
-                    Debug.Console(0, "Assigning SSL Configuration");
-                    _httpsServer.SslConfiguration = new ServerSslConfiguration(new X509Certificate2(certPath, certPassword))
-                    {
-                        ClientCertificateRequired = false,
-                        CheckCertificateRevocation = false,
-                        EnabledSslProtocols = SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls,
-                        //this is just to test, you might want to actually validate
-                        ClientCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) =>
-                        {
-                            Debug.Console(0, "HTTPS ClientCerticateValidation Callback triggered");
-                            return true;
-                        }
-                    };
-                }
-                Debug.Console(0, "Adding Debug Client Service");
-                _httpsServer.AddWebSocketService<DebugClient>(_path);
-                Debug.Console(0, "Assigning Log Info");
-                _httpsServer.Log.Level = LogLevel.Trace;
-                _httpsServer.Log.Output = (d, s) =>
-                {
-                    uint level;
-
-                    switch(d.Level)
-                    {
-                        case WebSocketSharp.LogLevel.Fatal:
-                            level = 3;
-                            break;
-                        case WebSocketSharp.LogLevel.Error:
-                            level = 2;
-                            break;
-                        case WebSocketSharp.LogLevel.Warn:
-                            level = 1;
-                            break;
-                        case WebSocketSharp.LogLevel.Info:
-                            level = 0;
-                            break;
-                        case WebSocketSharp.LogLevel.Debug:
-                            level = 4;
-                            break;
-                        case WebSocketSharp.LogLevel.Trace:
-                            level = 5;
-                            break;
-                        default:
-                            level = 4;
-                            break;
-                    }
-                    
-                    Debug.Console(level, "{1} {0}\rCaller:{2}\rMessage:{3}\rs:{4}", d.Level.ToString(), d.Date.ToString(), d.Caller.ToString(), d.Message, s);
-                };
-                Debug.Console(0, "Starting");
-
-                _httpsServer.Start();
-                Debug.Console(0, "Ready");
-            }
-            catch (Exception ex)
-            {
-                Debug.Console(0, "WebSocket Failed to start {0}", ex.Message);
-            }
-        }
-
-        public void StopServer()
-        {
-            Debug.Console(0, "Stopping Websocket Server");
-            _httpsServer?.Stop();
-
-            _httpsServer = null;
+            Debug.Console(0, "WebSocket Failed to start {0}", ex.Message);
         }
     }
 
-    public static class DebugWebsocketSinkExtensions
+    /// <summary>
+    /// Stops the WebSocket server if it is currently running.
+    /// </summary>
+    /// <remarks>This method halts the WebSocket server and releases any associated resources.  After
+    /// calling this method, the server will no longer accept or process incoming connections.</remarks>
+    public void StopServer()
     {
-        public static LoggerConfiguration DebugWebsocketSink(
-                             this LoggerSinkConfiguration loggerConfiguration,
-                                              ITextFormatter formatProvider = null)
-        {
-            return loggerConfiguration.Sink(new DebugWebsocketSink(formatProvider));
-        }
-    }
+        Debug.Console(0, "Stopping Websocket Server");
+        _httpsServer?.Stop();
 
-    public class DebugClient : WebSocketBehavior
-    {
-        private DateTime _connectionTime;
-
-        public TimeSpan ConnectedDuration
-        {
-            get
-            {
-                if (Context.WebSocket.IsAlive)
-                {
-                    return DateTime.Now - _connectionTime;
-                }
-                else
-                {
-                    return new TimeSpan(0);
-                }
-            }
-        }
-
-        public DebugClient()
-        {
-            Debug.Console(0, "DebugClient Created");
-        }
-
-        protected override void OnOpen()
-        {
-            base.OnOpen();
-
-            var url = Context.WebSocket.Url;
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WebSocket Connection from: {0}", url);
-
-            _connectionTime = DateTime.Now;
-        }
-
-        protected override void OnMessage(MessageEventArgs e)
-        {
-            base.OnMessage(e);
-
-            Debug.Console(0, "WebSocket UiClient Message: {0}", e.Data);
-        }
-
-        protected override void OnClose(CloseEventArgs e)
-        {
-            base.OnClose(e);
-
-            Debug.Console(0, Debug.ErrorLogLevel.Notice, "WebSocket UiClient Closing: {0} reason: {1}", e.Code, e.Reason);
-
-        }
-
-        protected override void OnError(WebSocketSharp.ErrorEventArgs e)
-        {
-            base.OnError(e);
-
-            Debug.Console(2, Debug.ErrorLogLevel.Notice, "WebSocket UiClient Error: {0} message: {1}", e.Exception, e.Message);
-        }
+        _httpsServer = null;
+    }
+}
+
+/// <summary>
+/// Configures the logger to write log events to a debug WebSocket sink.
+/// </summary>
+/// <remarks>This extension method allows you to direct log events to a WebSocket sink for debugging
+/// purposes.</remarks>
+public static class DebugWebsocketSinkExtensions
+{
+    /// <summary>
+    /// Configures a logger to write log events to a debug WebSocket sink.
+    /// </summary>
+    /// <remarks>This method adds a sink that writes log events to a WebSocket for debugging purposes.
+    /// It is typically used during development to stream log events in real-time.</remarks>
+    /// <param name="loggerConfiguration">The logger sink configuration to apply the WebSocket sink to.</param>
+    /// <param name="formatProvider">An optional text formatter to format the log events. If not provided, a default formatter will be used.</param>
+    /// <returns>A <see cref="LoggerConfiguration"/> object that can be used to further configure the logger.</returns>
+    public static LoggerConfiguration DebugWebsocketSink(
+                         this LoggerSinkConfiguration loggerConfiguration,
+                                          ITextFormatter formatProvider = null)
+    {
+        return loggerConfiguration.Sink(new DebugWebsocketSink(formatProvider));
+    }
+}
+
+/// <summary>
+/// Represents a WebSocket client for debugging purposes, providing connection lifecycle management and message
+/// handling functionality.
+/// </summary>
+/// <remarks>The <see cref="DebugClient"/> class extends <see cref="WebSocketBehavior"/> to handle
+/// WebSocket connections, including events for opening, closing, receiving messages, and errors. It tracks the
+/// duration of the connection and logs relevant events for debugging.</remarks>
+public class DebugClient : WebSocketBehavior
+{
+    private DateTime _connectionTime;
+
+    /// <summary>
+    /// Gets the duration of time the WebSocket connection has been active.
+    /// </summary>
+    public TimeSpan ConnectedDuration
+    {
+        get
+        {
+            if (Context.WebSocket.IsAlive)
+            {
+                return DateTime.Now - _connectionTime;
+            }
+            else
+            {
+                return new TimeSpan(0);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DebugClient"/> class.
+    /// </summary>
+    /// <remarks>This constructor creates a new <see cref="DebugClient"/> instance and logs its
+    /// creation using the <see cref="Debug.Console(int, string)"/> method with a debug level of 0.</remarks>
+    public DebugClient()
+    {
+        Debug.Console(0, "DebugClient Created");
+    }
+
+    /// <inheritdoc/>
+    protected override void OnOpen()
+    {
+        base.OnOpen();
+
+        var url = Context.WebSocket.Url;
+        Debug.Console(0, Debug.ErrorLogLevel.Notice, "New WebSocket Connection from: {0}", url);
+
+        _connectionTime = DateTime.Now;
+    }
+
+    /// <inheritdoc/>
+    protected override void OnMessage(MessageEventArgs e)
+    {
+        base.OnMessage(e);
+
+        Debug.Console(0, "WebSocket UiClient Message: {0}", e.Data);
+    }
+
+    /// <inheritdoc/>
+    protected override void OnClose(CloseEventArgs e)
+    {
+        base.OnClose(e);
+
+        Debug.Console(0, Debug.ErrorLogLevel.Notice, "WebSocket UiClient Closing: {0} reason: {1}", e.Code, e.Reason);
+
+    }
+
+    /// <inheritdoc/>
+    protected override void OnError(WebSocketSharp.ErrorEventArgs e)
+    {
+        base.OnError(e);
+
+        Debug.Console(2, Debug.ErrorLogLevel.Notice, "WebSocket UiClient Error: {0} message: {1}", e.Exception, e.Message);
     }
 }

src/PepperDash.Core/Network/DiscoveryThings.cs

@@ -4,19 +4,17 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core
-{
+namespace PepperDash.Core;
+
+/// <summary>
+/// Not in use
+/// </summary>
+	public static class NetworkComm
+	{
     /// <summary>
     /// Not in use
     /// </summary>
-	public static class NetworkComm
-	{
-        /// <summary>
-        /// Not in use
-        /// </summary>
 		static NetworkComm()
 		{
 		}
-	}
-
-}
+	}

src/PepperDash.Core/PasswordManagement/Config.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.PasswordManagement
-{
+namespace PepperDash.Core.PasswordManagement;
+
 	/// <summary>
 	/// JSON password configuration 
 	/// </summary>
@@ -22,5 +22,4 @@ namespace PepperDash.Core.PasswordManagement
 	    {
 	        
 	    }
-	}
-}
+	}

src/PepperDash.Core/PasswordManagement/Constants.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.PasswordManagement
-{
+namespace PepperDash.Core.PasswordManagement;
+
 	/// <summary>
 	/// Constants
 	/// </summary>
@@ -53,5 +53,4 @@ namespace PepperDash.Core.PasswordManagement
 		/// Generic string value change constant
 		/// </summary>
 		public const ushort StringValueChange = 201;		
-	}
-}
+	}

src/PepperDash.Core/PasswordManagement/PasswordClient.cs

@@ -1,10 +1,10 @@
 using System;
 
-namespace PepperDash.Core.PasswordManagement
-{
-    /// <summary>
-    /// A class to allow user interaction with the PasswordManager
-    /// </summary>
+namespace PepperDash.Core.PasswordManagement;
+
+/// <summary>
+/// A class to allow user interaction with the PasswordManager
+/// </summary>
 	public class PasswordClient
 	{
 		/// <summary>
@@ -183,5 +183,4 @@ namespace PepperDash.Core.PasswordManagement
 				GetPasswordByIndex(args.Index);
 			}
 		}
-	}
-}
+	}

src/PepperDash.Core/PasswordManagement/PasswordManager.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.PasswordManagement
-{
-    /// <summary>
-    /// Allows passwords to be stored and managed
-    /// </summary>
+namespace PepperDash.Core.PasswordManagement;
+
+/// <summary>
+/// Allows passwords to be stored and managed
+/// </summary>
 	public class PasswordManager
 	{
 		/// <summary>
@@ -190,7 +190,7 @@ namespace PepperDash.Core.PasswordManagement
 		/// <summary>
 		/// Protected ushort change event handler
 		/// </summary>
-        /// <param name="value"></param>
+    /// <param name="value"></param>
 		/// <param name="index"></param>
 		/// <param name="type"></param>
 		protected void OnUshrtChange(ushort value, ushort index, ushort type)
@@ -237,5 +237,4 @@ namespace PepperDash.Core.PasswordManagement
 				PasswordChange(this, args);
 			}
 		}
-	}
-}
+	}

src/PepperDash.Core/PepperDash.Core.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <RootNamespace>PepperDash.Core</RootNamespace>
     <AssemblyName>PepperDashCore</AssemblyName>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
     <Deterministic>true</Deterministic>
     <NeutralLanguage>en</NeutralLanguage>
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -42,15 +42,16 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
-    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.90" />
-    <PackageReference Include="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.Expressions" Version="4.0.0" />
-    <PackageReference Include="Serilog.Formatting.Compact" Version="2.0.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Include="SSH.NET" Version="2024.2.0" />
-    <PackageReference Include="WebSocketSharp" Version="1.0.3-rc11" />
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Library" Version="2.21.128" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="Serilog" Version="4.3.0" />
+    <PackageReference Include="Serilog.Expressions" Version="5.0.0" />
+    <PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
+    <PackageReference Include="SSH.NET" Version="2025.0.0" />
+    <PackageReference Include="WebSocketSharp-netstandard" Version="1.0.1" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net6'">
 	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

src/PepperDash.Core/SystemInfo/EventArgs and Constants.cs

@@ -4,68 +4,68 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.SystemInfo
-{
+namespace PepperDash.Core.SystemInfo;
+
 	/// <summary>
 	/// Constants 
 	/// </summary>
 	public class SystemInfoConstants
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort BoolValueChange = 1;
 		/// <summary>
 		/// 
 		/// </summary>
-        public const ushort CompleteBoolChange = 2;
+    public const ushort CompleteBoolChange = 2;
 		/// <summary>
 		/// 
 		/// </summary>
-        public const ushort BusyBoolChange = 3;
-        
-        /// <summary>
-        /// 
-        /// </summary>
+    public const ushort BusyBoolChange = 3;
+    
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort UshortValueChange = 101;
 
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort StringValueChange = 201;
 		/// <summary>
 		/// 
 		/// </summary>
-        public const ushort ConsoleResponseChange = 202;
+    public const ushort ConsoleResponseChange = 202;
 		/// <summary>
 		/// 
 		/// </summary>
-        public const ushort ProcessorUptimeChange = 203;
+    public const ushort ProcessorUptimeChange = 203;
 		/// <summary>
 		/// 
 		/// </summary>
-        public const ushort ProgramUptimeChange = 204;
+    public const ushort ProgramUptimeChange = 204;
 
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public const ushort ObjectChange = 301;
 		/// <summary>
 		/// 
 		/// </summary>
-        public const ushort ProcessorConfigChange = 302;
+    public const ushort ProcessorConfigChange = 302;
 		/// <summary>
 		/// 
 		/// </summary>
-        public const ushort EthernetConfigChange = 303;
+    public const ushort EthernetConfigChange = 303;
 		/// <summary>
 		/// 
 		/// </summary>
-        public const ushort ControlSubnetConfigChange = 304;
+    public const ushort ControlSubnetConfigChange = 304;
 		/// <summary>
 		/// 
 		/// </summary>
-        public const ushort ProgramConfigChange = 305;
+    public const ushort ProgramConfigChange = 305;
 	}
 
 	/// <summary>
@@ -73,18 +73,18 @@ namespace PepperDash.Core.SystemInfo
 	/// </summary>
 	public class ProcessorChangeEventArgs : EventArgs
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ProcessorInfo Processor { get; set; }
 		/// <summary>
 		/// 
 		/// </summary>
-        public ushort Type { get; set; }
+    public ushort Type { get; set; }
 		/// <summary>
 		/// 
 		/// </summary>
-        public ushort Index { get; set; }
+    public ushort Index { get; set; }
 
 		/// <summary>
 		/// Constructor
@@ -119,18 +119,18 @@ namespace PepperDash.Core.SystemInfo
 	/// </summary>
 	public class EthernetChangeEventArgs : EventArgs
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public EthernetInfo Adapter { get; set; }
 		/// <summary>
 		/// 
 		/// </summary>
-        public ushort Type { get; set; }
+    public ushort Type { get; set; }
 		/// <summary>
 		/// 
 		/// </summary>
-        public ushort Index { get; set; }
+    public ushort Index { get; set; }
 
 		/// <summary>
 		/// Constructor
@@ -143,7 +143,7 @@ namespace PepperDash.Core.SystemInfo
 		/// <summary>
 		/// Constructor overload
 		/// </summary>
-        /// <param name="ethernet"></param>
+    /// <param name="ethernet"></param>
 		/// <param name="type"></param>
 		public EthernetChangeEventArgs(EthernetInfo ethernet, ushort type)
 		{
@@ -154,9 +154,9 @@ namespace PepperDash.Core.SystemInfo
 		/// <summary>
 		/// Constructor overload
 		/// </summary>
-        /// <param name="ethernet"></param>
+    /// <param name="ethernet"></param>
 		/// <param name="type"></param>
-        /// <param name="index"></param>
+    /// <param name="index"></param>
 		public EthernetChangeEventArgs(EthernetInfo ethernet, ushort type, ushort index)
 		{
 			Adapter = ethernet;
@@ -170,18 +170,18 @@ namespace PepperDash.Core.SystemInfo
 	/// </summary>
 	public class ControlSubnetChangeEventArgs : EventArgs
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ControlSubnetInfo Adapter { get; set; }
 		/// <summary>
 		/// 
 		/// </summary>
-        public ushort Type { get; set; }
+    public ushort Type { get; set; }
 		/// <summary>
 		/// 
 		/// </summary>
-        public ushort Index { get; set; }
+    public ushort Index { get; set; }
 
 		/// <summary>
 		/// Constructor
@@ -216,18 +216,18 @@ namespace PepperDash.Core.SystemInfo
 	/// </summary>
 	public class ProgramChangeEventArgs : EventArgs
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ProgramInfo Program { get; set; }
 		/// <summary>
 		/// 
 		/// </summary>
-        public ushort Type { get; set; }
+    public ushort Type { get; set; }
 		/// <summary>
 		/// 
 		/// </summary>
-        public ushort Index { get; set; }
+    public ushort Index { get; set; }
 
 		/// <summary>
 		/// Constructor
@@ -240,7 +240,7 @@ namespace PepperDash.Core.SystemInfo
 		/// <summary>
 		/// Constructor overload
 		/// </summary>
-        /// <param name="program"></param>
+    /// <param name="program"></param>
 		/// <param name="type"></param>
 		public ProgramChangeEventArgs(ProgramInfo program, ushort type)
 		{
@@ -251,14 +251,13 @@ namespace PepperDash.Core.SystemInfo
 		/// <summary>
 		/// Constructor overload
 		/// </summary>
-        /// <param name="program"></param>
+    /// <param name="program"></param>
 		/// <param name="type"></param>
-        /// <param name="index"></param>
+    /// <param name="index"></param>
 		public ProgramChangeEventArgs(ProgramInfo program, ushort type, ushort index)
 		{
 			Program = program;
 			Type = type;
 			Index = index;
 		}
-	}
-}
+	}

src/PepperDash.Core/SystemInfo/SystemInfoConfig.cs

@@ -4,52 +4,52 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.SystemInfo
-{
+namespace PepperDash.Core.SystemInfo;
+
 	/// <summary>
 	/// Processor info class
 	/// </summary>
 	public class ProcessorInfo
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Model { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string SerialNumber { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Firmware { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string FirmwareDate { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string OsVersion { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string RuntimeEnvironment { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string DevicePlatform { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string ModuleDirectory { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string LocalTimeZone { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string ProgramIdTag { get; set; }
 
 		/// <summary>
@@ -66,45 +66,45 @@ namespace PepperDash.Core.SystemInfo
 	/// </summary>
 	public class EthernetInfo
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort DhcpIsOn { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Hostname { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string MacAddress { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string IpAddress { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Subnet { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Gateway { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Dns1 { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Dns2 { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Dns3 { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Domain { get; set; }
 
 		/// <summary>
@@ -121,29 +121,29 @@ namespace PepperDash.Core.SystemInfo
 	/// </summary>
 	public class ControlSubnetInfo
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort Enabled { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public ushort IsInAutomaticMode { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string MacAddress { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string IpAddress { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Subnet { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string RouterPrefix { get; set; }
 
 		/// <summary>
@@ -160,37 +160,37 @@ namespace PepperDash.Core.SystemInfo
 	/// </summary>
 	public class ProgramInfo
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Name { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Header { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string System { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string ProgramIdTag { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string CompileTime { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Database { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Environment { get; set; }
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string Programmer { get; set; }
 
 		/// <summary>
@@ -200,5 +200,4 @@ namespace PepperDash.Core.SystemInfo
 		{
 			
 		}
-	}
-}
+	}

src/PepperDash.Core/SystemInfo/SystemInfoToSimpl.cs

@@ -4,37 +4,37 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.SystemInfo
-{
+namespace PepperDash.Core.SystemInfo;
+
 	/// <summary>
 	/// System Info class
 	/// </summary>
 	public class SystemInfoToSimpl
 	{
-        /// <summary>
-        /// Notifies of bool change
-        /// </summary>
+    /// <summary>
+    /// Notifies of bool change
+    /// </summary>
 		public event EventHandler<BoolChangeEventArgs> BoolChange;
-        /// <summary>
-        /// Notifies of string change
-        /// </summary>
+    /// <summary>
+    /// Notifies of string change
+    /// </summary>
 		public event EventHandler<StringChangeEventArgs> StringChange;
 
-        /// <summary>
-        /// Notifies of processor change
-        /// </summary>
+    /// <summary>
+    /// Notifies of processor change
+    /// </summary>
 		public event EventHandler<ProcessorChangeEventArgs> ProcessorChange;
-        /// <summary>
-        /// Notifies of ethernet change
-        /// </summary>
+    /// <summary>
+    /// Notifies of ethernet change
+    /// </summary>
 		public event EventHandler<EthernetChangeEventArgs> EthernetChange;
-        /// <summary>
-        /// Notifies of control subnet change
-        /// </summary>
+    /// <summary>
+    /// Notifies of control subnet change
+    /// </summary>
 		public event EventHandler<ControlSubnetChangeEventArgs> ControlSubnetChange;
-        /// <summary>
-        /// Notifies of program change
-        /// </summary>
+    /// <summary>
+    /// Notifies of program change
+    /// </summary>
 		public event EventHandler<ProgramChangeEventArgs> ProgramChange;
 
 		/// <summary>
@@ -327,10 +327,10 @@ namespace PepperDash.Core.SystemInfo
 		/// <summary>
 		/// private method to parse console messages
 		/// </summary>
-        /// <param name="data"></param>
+    /// <param name="data"></param>
 		/// <param name="line"></param>
-        /// <param name="dataStart"></param>
-        /// <param name="dataEnd"></param>
+    /// <param name="dataStart"></param>
+    /// <param name="dataEnd"></param>
 		/// <returns></returns>
 		private string ParseConsoleResponse(string data, string line, string dataStart, string dataEnd)
 		{
@@ -458,5 +458,4 @@ namespace PepperDash.Core.SystemInfo
 				ProgramChange(this, args);
 			}
 		}
-	}
-}
+	}

src/PepperDash.Core/Web/BouncyCertificate.cs

@@ -20,337 +20,336 @@ using Org.BouncyCastle.Crypto.Operators;
 using BigInteger = Org.BouncyCastle.Math.BigInteger;
 using X509Certificate = Org.BouncyCastle.X509.X509Certificate;
 
-namespace PepperDash.Core
+namespace PepperDash.Core;
+
+/// <summary>
+/// Taken From https://github.com/rlipscombe/bouncy-castle-csharp/
+/// </summary>
+internal class BouncyCertificate
 {
-    /// <summary>
-    /// Taken From https://github.com/rlipscombe/bouncy-castle-csharp/
-    /// </summary>
-    internal class BouncyCertificate
+    public string CertificatePassword { get; set; } = "password";
+    public X509Certificate2 LoadCertificate(string issuerFileName, string password)
     {
-        public string CertificatePassword { get; set; } = "password";
-        public X509Certificate2 LoadCertificate(string issuerFileName, string password)
+        // We need to pass 'Exportable', otherwise we can't get the private key.
+        var issuerCertificate = new X509Certificate2(issuerFileName, password, X509KeyStorageFlags.Exportable);
+        return issuerCertificate;
+    }
+
+    public X509Certificate2 IssueCertificate(string subjectName, X509Certificate2 issuerCertificate, string[] subjectAlternativeNames, KeyPurposeID[] usages)
+    {
+        // It's self-signed, so these are the same.
+        var issuerName = issuerCertificate.Subject;
+
+        var random = GetSecureRandom();
+        var subjectKeyPair = GenerateKeyPair(random, 2048);
+
+        var issuerKeyPair = DotNetUtilities.GetKeyPair(issuerCertificate.PrivateKey);
+
+        var serialNumber = GenerateSerialNumber(random);
+        var issuerSerialNumber = new BigInteger(issuerCertificate.GetSerialNumber());
+
+        const bool isCertificateAuthority = false;
+        var certificate = GenerateCertificate(random, subjectName, subjectKeyPair, serialNumber,
+                                              subjectAlternativeNames, issuerName, issuerKeyPair,
+                                              issuerSerialNumber, isCertificateAuthority,
+                                              usages);
+        return ConvertCertificate(certificate, subjectKeyPair, random);
+    }
+
+    public X509Certificate2 CreateCertificateAuthorityCertificate(string subjectName, string[] subjectAlternativeNames, KeyPurposeID[] usages)
+    {
+        // It's self-signed, so these are the same.
+        var issuerName = subjectName;
+
+        var random = GetSecureRandom();
+        var subjectKeyPair = GenerateKeyPair(random, 2048);
+
+        // It's self-signed, so these are the same.
+        var issuerKeyPair = subjectKeyPair;
+
+        var serialNumber = GenerateSerialNumber(random);
+        var issuerSerialNumber = serialNumber; // Self-signed, so it's the same serial number.
+
+        const bool isCertificateAuthority = true;
+        var certificate = GenerateCertificate(random, subjectName, subjectKeyPair, serialNumber,
+                                              subjectAlternativeNames, issuerName, issuerKeyPair,
+                                              issuerSerialNumber, isCertificateAuthority,
+                                              usages);
+        return ConvertCertificate(certificate, subjectKeyPair, random);
+    }
+
+    public X509Certificate2 CreateSelfSignedCertificate(string subjectName, string[] subjectAlternativeNames, KeyPurposeID[] usages)
+    {
+        // It's self-signed, so these are the same.
+        var issuerName = subjectName;
+
+        var random = GetSecureRandom();
+        var subjectKeyPair = GenerateKeyPair(random, 2048);
+
+        // It's self-signed, so these are the same.
+        var issuerKeyPair = subjectKeyPair;
+
+        var serialNumber = GenerateSerialNumber(random);
+        var issuerSerialNumber = serialNumber; // Self-signed, so it's the same serial number.
+
+        const bool isCertificateAuthority = false;
+        var certificate = GenerateCertificate(random, subjectName, subjectKeyPair, serialNumber,
+                                              subjectAlternativeNames, issuerName, issuerKeyPair,
+                                              issuerSerialNumber, isCertificateAuthority,
+                                              usages);
+        return ConvertCertificate(certificate, subjectKeyPair, random);
+    }
+
+    private SecureRandom GetSecureRandom()
+    {
+        // Since we're on Windows, we'll use the CryptoAPI one (on the assumption
+        // that it might have access to better sources of entropy than the built-in
+        // Bouncy Castle ones):
+        var randomGenerator = new CryptoApiRandomGenerator();
+        var random = new SecureRandom(randomGenerator);
+        return random;
+    }
+
+    private X509Certificate GenerateCertificate(SecureRandom random,
+                                                       string subjectName,
+                                                       AsymmetricCipherKeyPair subjectKeyPair,
+                                                       BigInteger subjectSerialNumber,
+                                                       string[] subjectAlternativeNames,
+                                                       string issuerName,
+                                                       AsymmetricCipherKeyPair issuerKeyPair,
+                                                       BigInteger issuerSerialNumber,
+                                                       bool isCertificateAuthority,
+                                                       KeyPurposeID[] usages)
+    {
+        var certificateGenerator = new X509V3CertificateGenerator();
+
+        certificateGenerator.SetSerialNumber(subjectSerialNumber);
+
+        var issuerDN = new X509Name(issuerName);
+        certificateGenerator.SetIssuerDN(issuerDN);
+
+        // Note: The subject can be omitted if you specify a subject alternative name (SAN).
+        var subjectDN = new X509Name(subjectName);
+        certificateGenerator.SetSubjectDN(subjectDN);
+
+        // Our certificate needs valid from/to values.
+        var notBefore = DateTime.UtcNow.Date;
+        var notAfter = notBefore.AddYears(2);
+
+        certificateGenerator.SetNotBefore(notBefore);
+        certificateGenerator.SetNotAfter(notAfter);
+
+        // The subject's public key goes in the certificate.
+        certificateGenerator.SetPublicKey(subjectKeyPair.Public);
+
+        AddAuthorityKeyIdentifier(certificateGenerator, issuerDN, issuerKeyPair, issuerSerialNumber);
+        AddSubjectKeyIdentifier(certificateGenerator, subjectKeyPair);
+        //AddBasicConstraints(certificateGenerator, isCertificateAuthority);
+
+        if (usages != null && usages.Any())
+            AddExtendedKeyUsage(certificateGenerator, usages);
+
+        if (subjectAlternativeNames != null && subjectAlternativeNames.Any())
+            AddSubjectAlternativeNames(certificateGenerator, subjectAlternativeNames);
+
+        // Set the signature algorithm. This is used to generate the thumbprint which is then signed
+        // with the issuer's private key. We'll use SHA-256, which is (currently) considered fairly strong.
+        const string signatureAlgorithm = "SHA256WithRSA";
+
+        // The certificate is signed with the issuer's private key.
+        ISignatureFactory signatureFactory = new Asn1SignatureFactory(signatureAlgorithm, issuerKeyPair.Private, random);
+        var certificate = certificateGenerator.Generate(signatureFactory);
+        return certificate;
+    }
+
+    /// <summary>
+    /// The certificate needs a serial number. This is used for revocation,
+    /// and usually should be an incrementing index (which makes it easier to revoke a range of certificates).
+    /// Since we don't have anywhere to store the incrementing index, we can just use a random number.
+    /// </summary>
+    /// <param name="random"></param>
+    /// <returns></returns>
+    private BigInteger GenerateSerialNumber(SecureRandom random)
+    {
+        var serialNumber =
+            BigIntegers.CreateRandomInRange(
+                BigInteger.One, BigInteger.ValueOf(Int64.MaxValue), random);
+        return serialNumber;
+    }
+
+    /// <summary>
+    /// Generate a key pair.
+    /// </summary>
+    /// <param name="random">The random number generator.</param>
+    /// <param name="strength">The key length in bits. For RSA, 2048 bits should be considered the minimum acceptable these days.</param>
+    /// <returns></returns>
+    private AsymmetricCipherKeyPair GenerateKeyPair(SecureRandom random, int strength)
+    {
+        var keyGenerationParameters = new KeyGenerationParameters(random, strength);
+
+        var keyPairGenerator = new RsaKeyPairGenerator();
+        keyPairGenerator.Init(keyGenerationParameters);
+        var subjectKeyPair = keyPairGenerator.GenerateKeyPair();
+        return subjectKeyPair;
+    }
+
+    /// <summary>
+    /// Add the Authority Key Identifier. According to http://www.alvestrand.no/objectid/2.5.29.35.html, this
+    /// identifies the public key to be used to verify the signature on this certificate.
+    /// In a certificate chain, this corresponds to the "Subject Key Identifier" on the *issuer* certificate.
+    /// The Bouncy Castle documentation, at http://www.bouncycastle.org/wiki/display/JA1/X.509+Public+Key+Certificate+and+Certification+Request+Generation,
+    /// shows how to create this from the issuing certificate. Since we're creating a self-signed certificate, we have to do this slightly differently.
+    /// </summary>
+    /// <param name="certificateGenerator"></param>
+    /// <param name="issuerDN"></param>
+    /// <param name="issuerKeyPair"></param>
+    /// <param name="issuerSerialNumber"></param>
+    private void AddAuthorityKeyIdentifier(X509V3CertificateGenerator certificateGenerator,
+                                                  X509Name issuerDN,
+                                                  AsymmetricCipherKeyPair issuerKeyPair,
+                                                  BigInteger issuerSerialNumber)
+    {
+        var authorityKeyIdentifierExtension =
+            new AuthorityKeyIdentifier(
+                SubjectPublicKeyInfoFactory.CreateSubjectPublicKeyInfo(issuerKeyPair.Public),
+                new GeneralNames(new GeneralName(issuerDN)),
+        issuerSerialNumber);
+        certificateGenerator.AddExtension(
+            X509Extensions.AuthorityKeyIdentifier.Id, false, authorityKeyIdentifierExtension);
+    }
+
+    /// <summary>
+    /// Add the "Subject Alternative Names" extension. Note that you have to repeat
+    /// the value from the "Subject Name" property.
+    /// </summary>
+    /// <param name="certificateGenerator"></param>
+    /// <param name="subjectAlternativeNames"></param>
+    private void AddSubjectAlternativeNames(X509V3CertificateGenerator certificateGenerator,
+                                                   IEnumerable<string> subjectAlternativeNames)
+    {
+        var subjectAlternativeNamesExtension =
+            new DerSequence(
+                subjectAlternativeNames.Select(name => new GeneralName(GeneralName.DnsName, name))
+                                       .ToArray<Asn1Encodable>());
+        certificateGenerator.AddExtension(
+            X509Extensions.SubjectAlternativeName.Id, false, subjectAlternativeNamesExtension);
+    }
+
+    /// <summary>
+    /// Add the "Extended Key Usage" extension, specifying (for example) "server authentication".
+    /// </summary>
+    /// <param name="certificateGenerator"></param>
+    /// <param name="usages"></param>
+    private void AddExtendedKeyUsage(X509V3CertificateGenerator certificateGenerator, KeyPurposeID[] usages)
+    {
+        certificateGenerator.AddExtension(
+            X509Extensions.ExtendedKeyUsage.Id, false, new ExtendedKeyUsage(usages));
+    }
+
+    /// <summary>
+    /// Add the "Basic Constraints" extension.
+    /// </summary>
+    /// <param name="certificateGenerator"></param>
+    /// <param name="isCertificateAuthority"></param>
+    private void AddBasicConstraints(X509V3CertificateGenerator certificateGenerator,
+                                            bool isCertificateAuthority)
+    {
+        certificateGenerator.AddExtension(
+            X509Extensions.BasicConstraints.Id, true, new BasicConstraints(isCertificateAuthority));
+    }
+
+    /// <summary>
+    /// Add the Subject Key Identifier.
+    /// </summary>
+    /// <param name="certificateGenerator"></param>
+    /// <param name="subjectKeyPair"></param>
+    private void AddSubjectKeyIdentifier(X509V3CertificateGenerator certificateGenerator,
+                                                AsymmetricCipherKeyPair subjectKeyPair)
+    {
+        var subjectKeyIdentifierExtension =
+            new SubjectKeyIdentifier(
+                SubjectPublicKeyInfoFactory.CreateSubjectPublicKeyInfo(subjectKeyPair.Public));
+        certificateGenerator.AddExtension(
+            X509Extensions.SubjectKeyIdentifier.Id, false, subjectKeyIdentifierExtension);
+    }
+
+    private X509Certificate2 ConvertCertificate(X509Certificate certificate,
+                                                       AsymmetricCipherKeyPair subjectKeyPair,
+                                                       SecureRandom random)
+    {
+        // Now to convert the Bouncy Castle certificate to a .NET certificate.
+        // See http://web.archive.org/web/20100504192226/http://www.fkollmann.de/v2/post/Creating-certificates-using-BouncyCastle.aspx
+        // ...but, basically, we create a PKCS12 store (a .PFX file) in memory, and add the public and private key to that.
+        var store = new Pkcs12StoreBuilder().Build();
+
+        // What Bouncy Castle calls "alias" is the same as what Windows terms the "friendly name".
+        string friendlyName = certificate.SubjectDN.ToString();
+
+        // Add the certificate.
+        var certificateEntry = new X509CertificateEntry(certificate);
+        store.SetCertificateEntry(friendlyName, certificateEntry);
+
+        // Add the private key.
+        store.SetKeyEntry(friendlyName, new AsymmetricKeyEntry(subjectKeyPair.Private), new[] { certificateEntry });
+
+        // Convert it to an X509Certificate2 object by saving/loading it from a MemoryStream.
+        // It needs a password. Since we'll remove this later, it doesn't particularly matter what we use.
+
+        var stream = new MemoryStream();
+        store.Save(stream, CertificatePassword.ToCharArray(), random);
+
+        var convertedCertificate =
+            new X509Certificate2(stream.ToArray(),
+                                 CertificatePassword,
+                                 X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable);
+        return convertedCertificate;
+    }
+
+    public void WriteCertificate(X509Certificate2 certificate, string outputDirectory, string certName)
+    {
+        // This password is the one attached to the PFX file. Use 'null' for no password.
+        // Create PFX (PKCS #12) with private key
+        try
         {
-            // We need to pass 'Exportable', otherwise we can't get the private key.
-            var issuerCertificate = new X509Certificate2(issuerFileName, password, X509KeyStorageFlags.Exportable);
-            return issuerCertificate;
+            var pfx = certificate.Export(X509ContentType.Pfx, CertificatePassword);
+            File.WriteAllBytes(string.Format("{0}.pfx", Path.Combine(outputDirectory, certName)), pfx);
         }
-
-        public X509Certificate2 IssueCertificate(string subjectName, X509Certificate2 issuerCertificate, string[] subjectAlternativeNames, KeyPurposeID[] usages)
+        catch (Exception ex)
         {
-            // It's self-signed, so these are the same.
-            var issuerName = issuerCertificate.Subject;
-
-            var random = GetSecureRandom();
-            var subjectKeyPair = GenerateKeyPair(random, 2048);
-
-            var issuerKeyPair = DotNetUtilities.GetKeyPair(issuerCertificate.PrivateKey);
-
-            var serialNumber = GenerateSerialNumber(random);
-            var issuerSerialNumber = new BigInteger(issuerCertificate.GetSerialNumber());
-
-            const bool isCertificateAuthority = false;
-            var certificate = GenerateCertificate(random, subjectName, subjectKeyPair, serialNumber,
-                                                  subjectAlternativeNames, issuerName, issuerKeyPair,
-                                                  issuerSerialNumber, isCertificateAuthority,
-                                                  usages);
-            return ConvertCertificate(certificate, subjectKeyPair, random);
+            CrestronConsole.PrintLine(string.Format("Failed to write x509 cert pfx\r\n{0}", ex.Message));
         }
-
-        public X509Certificate2 CreateCertificateAuthorityCertificate(string subjectName, string[] subjectAlternativeNames, KeyPurposeID[] usages)
+        // Create Base 64 encoded CER (public key only)
+        using (var writer = new StreamWriter($"{Path.Combine(outputDirectory, certName)}.cer", false))
         {
-            // It's self-signed, so these are the same.
-            var issuerName = subjectName;
-
-            var random = GetSecureRandom();
-            var subjectKeyPair = GenerateKeyPair(random, 2048);
-
-            // It's self-signed, so these are the same.
-            var issuerKeyPair = subjectKeyPair;
-
-            var serialNumber = GenerateSerialNumber(random);
-            var issuerSerialNumber = serialNumber; // Self-signed, so it's the same serial number.
-
-            const bool isCertificateAuthority = true;
-            var certificate = GenerateCertificate(random, subjectName, subjectKeyPair, serialNumber,
-                                                  subjectAlternativeNames, issuerName, issuerKeyPair,
-                                                  issuerSerialNumber, isCertificateAuthority,
-                                                  usages);
-            return ConvertCertificate(certificate, subjectKeyPair, random);
-        }
-
-        public X509Certificate2 CreateSelfSignedCertificate(string subjectName, string[] subjectAlternativeNames, KeyPurposeID[] usages)
-        {
-            // It's self-signed, so these are the same.
-            var issuerName = subjectName;
-
-            var random = GetSecureRandom();
-            var subjectKeyPair = GenerateKeyPair(random, 2048);
-
-            // It's self-signed, so these are the same.
-            var issuerKeyPair = subjectKeyPair;
-
-            var serialNumber = GenerateSerialNumber(random);
-            var issuerSerialNumber = serialNumber; // Self-signed, so it's the same serial number.
-
-            const bool isCertificateAuthority = false;
-            var certificate = GenerateCertificate(random, subjectName, subjectKeyPair, serialNumber,
-                                                  subjectAlternativeNames, issuerName, issuerKeyPair,
-                                                  issuerSerialNumber, isCertificateAuthority,
-                                                  usages);
-            return ConvertCertificate(certificate, subjectKeyPair, random);
-        }
-
-        private SecureRandom GetSecureRandom()
-        {
-            // Since we're on Windows, we'll use the CryptoAPI one (on the assumption
-            // that it might have access to better sources of entropy than the built-in
-            // Bouncy Castle ones):
-            var randomGenerator = new CryptoApiRandomGenerator();
-            var random = new SecureRandom(randomGenerator);
-            return random;
-        }
-
-        private X509Certificate GenerateCertificate(SecureRandom random,
-                                                           string subjectName,
-                                                           AsymmetricCipherKeyPair subjectKeyPair,
-                                                           BigInteger subjectSerialNumber,
-                                                           string[] subjectAlternativeNames,
-                                                           string issuerName,
-                                                           AsymmetricCipherKeyPair issuerKeyPair,
-                                                           BigInteger issuerSerialNumber,
-                                                           bool isCertificateAuthority,
-                                                           KeyPurposeID[] usages)
-        {
-            var certificateGenerator = new X509V3CertificateGenerator();
-
-            certificateGenerator.SetSerialNumber(subjectSerialNumber);
-
-            var issuerDN = new X509Name(issuerName);
-            certificateGenerator.SetIssuerDN(issuerDN);
-
-            // Note: The subject can be omitted if you specify a subject alternative name (SAN).
-            var subjectDN = new X509Name(subjectName);
-            certificateGenerator.SetSubjectDN(subjectDN);
-
-            // Our certificate needs valid from/to values.
-            var notBefore = DateTime.UtcNow.Date;
-            var notAfter = notBefore.AddYears(2);
-
-            certificateGenerator.SetNotBefore(notBefore);
-            certificateGenerator.SetNotAfter(notAfter);
-
-            // The subject's public key goes in the certificate.
-            certificateGenerator.SetPublicKey(subjectKeyPair.Public);
-
-            AddAuthorityKeyIdentifier(certificateGenerator, issuerDN, issuerKeyPair, issuerSerialNumber);
-            AddSubjectKeyIdentifier(certificateGenerator, subjectKeyPair);
-            //AddBasicConstraints(certificateGenerator, isCertificateAuthority);
-
-            if (usages != null && usages.Any())
-                AddExtendedKeyUsage(certificateGenerator, usages);
-
-            if (subjectAlternativeNames != null && subjectAlternativeNames.Any())
-                AddSubjectAlternativeNames(certificateGenerator, subjectAlternativeNames);
-
-            // Set the signature algorithm. This is used to generate the thumbprint which is then signed
-            // with the issuer's private key. We'll use SHA-256, which is (currently) considered fairly strong.
-            const string signatureAlgorithm = "SHA256WithRSA";
-
-            // The certificate is signed with the issuer's private key.
-            ISignatureFactory signatureFactory = new Asn1SignatureFactory(signatureAlgorithm, issuerKeyPair.Private, random);
-            var certificate = certificateGenerator.Generate(signatureFactory);
-            return certificate;
-        }
-
-        /// <summary>
-        /// The certificate needs a serial number. This is used for revocation,
-        /// and usually should be an incrementing index (which makes it easier to revoke a range of certificates).
-        /// Since we don't have anywhere to store the incrementing index, we can just use a random number.
-        /// </summary>
-        /// <param name="random"></param>
-        /// <returns></returns>
-        private BigInteger GenerateSerialNumber(SecureRandom random)
-        {
-            var serialNumber =
-                BigIntegers.CreateRandomInRange(
-                    BigInteger.One, BigInteger.ValueOf(Int64.MaxValue), random);
-            return serialNumber;
-        }
-
-        /// <summary>
-        /// Generate a key pair.
-        /// </summary>
-        /// <param name="random">The random number generator.</param>
-        /// <param name="strength">The key length in bits. For RSA, 2048 bits should be considered the minimum acceptable these days.</param>
-        /// <returns></returns>
-        private AsymmetricCipherKeyPair GenerateKeyPair(SecureRandom random, int strength)
-        {
-            var keyGenerationParameters = new KeyGenerationParameters(random, strength);
-
-            var keyPairGenerator = new RsaKeyPairGenerator();
-            keyPairGenerator.Init(keyGenerationParameters);
-            var subjectKeyPair = keyPairGenerator.GenerateKeyPair();
-            return subjectKeyPair;
-        }
-
-        /// <summary>
-        /// Add the Authority Key Identifier. According to http://www.alvestrand.no/objectid/2.5.29.35.html, this
-        /// identifies the public key to be used to verify the signature on this certificate.
-        /// In a certificate chain, this corresponds to the "Subject Key Identifier" on the *issuer* certificate.
-        /// The Bouncy Castle documentation, at http://www.bouncycastle.org/wiki/display/JA1/X.509+Public+Key+Certificate+and+Certification+Request+Generation,
-        /// shows how to create this from the issuing certificate. Since we're creating a self-signed certificate, we have to do this slightly differently.
-        /// </summary>
-        /// <param name="certificateGenerator"></param>
-        /// <param name="issuerDN"></param>
-        /// <param name="issuerKeyPair"></param>
-        /// <param name="issuerSerialNumber"></param>
-        private void AddAuthorityKeyIdentifier(X509V3CertificateGenerator certificateGenerator,
-                                                      X509Name issuerDN,
-                                                      AsymmetricCipherKeyPair issuerKeyPair,
-                                                      BigInteger issuerSerialNumber)
-        {
-            var authorityKeyIdentifierExtension =
-                new AuthorityKeyIdentifier(
-                    SubjectPublicKeyInfoFactory.CreateSubjectPublicKeyInfo(issuerKeyPair.Public),
-                    new GeneralNames(new GeneralName(issuerDN)),
-            issuerSerialNumber);
-            certificateGenerator.AddExtension(
-                X509Extensions.AuthorityKeyIdentifier.Id, false, authorityKeyIdentifierExtension);
-        }
-
-        /// <summary>
-        /// Add the "Subject Alternative Names" extension. Note that you have to repeat
-        /// the value from the "Subject Name" property.
-        /// </summary>
-        /// <param name="certificateGenerator"></param>
-        /// <param name="subjectAlternativeNames"></param>
-        private void AddSubjectAlternativeNames(X509V3CertificateGenerator certificateGenerator,
-                                                       IEnumerable<string> subjectAlternativeNames)
-        {
-            var subjectAlternativeNamesExtension =
-                new DerSequence(
-                    subjectAlternativeNames.Select(name => new GeneralName(GeneralName.DnsName, name))
-                                           .ToArray<Asn1Encodable>());
-            certificateGenerator.AddExtension(
-                X509Extensions.SubjectAlternativeName.Id, false, subjectAlternativeNamesExtension);
-        }
-
-        /// <summary>
-        /// Add the "Extended Key Usage" extension, specifying (for example) "server authentication".
-        /// </summary>
-        /// <param name="certificateGenerator"></param>
-        /// <param name="usages"></param>
-        private void AddExtendedKeyUsage(X509V3CertificateGenerator certificateGenerator, KeyPurposeID[] usages)
-        {
-            certificateGenerator.AddExtension(
-                X509Extensions.ExtendedKeyUsage.Id, false, new ExtendedKeyUsage(usages));
-        }
-
-        /// <summary>
-        /// Add the "Basic Constraints" extension.
-        /// </summary>
-        /// <param name="certificateGenerator"></param>
-        /// <param name="isCertificateAuthority"></param>
-        private void AddBasicConstraints(X509V3CertificateGenerator certificateGenerator,
-                                                bool isCertificateAuthority)
-        {
-            certificateGenerator.AddExtension(
-                X509Extensions.BasicConstraints.Id, true, new BasicConstraints(isCertificateAuthority));
-        }
-
-        /// <summary>
-        /// Add the Subject Key Identifier.
-        /// </summary>
-        /// <param name="certificateGenerator"></param>
-        /// <param name="subjectKeyPair"></param>
-        private void AddSubjectKeyIdentifier(X509V3CertificateGenerator certificateGenerator,
-                                                    AsymmetricCipherKeyPair subjectKeyPair)
-        {
-            var subjectKeyIdentifierExtension =
-                new SubjectKeyIdentifier(
-                    SubjectPublicKeyInfoFactory.CreateSubjectPublicKeyInfo(subjectKeyPair.Public));
-            certificateGenerator.AddExtension(
-                X509Extensions.SubjectKeyIdentifier.Id, false, subjectKeyIdentifierExtension);
-        }
-
-        private X509Certificate2 ConvertCertificate(X509Certificate certificate,
-                                                           AsymmetricCipherKeyPair subjectKeyPair,
-                                                           SecureRandom random)
-        {
-            // Now to convert the Bouncy Castle certificate to a .NET certificate.
-            // See http://web.archive.org/web/20100504192226/http://www.fkollmann.de/v2/post/Creating-certificates-using-BouncyCastle.aspx
-            // ...but, basically, we create a PKCS12 store (a .PFX file) in memory, and add the public and private key to that.
-            var store = new Pkcs12StoreBuilder().Build();
-
-            // What Bouncy Castle calls "alias" is the same as what Windows terms the "friendly name".
-            string friendlyName = certificate.SubjectDN.ToString();
-
-            // Add the certificate.
-            var certificateEntry = new X509CertificateEntry(certificate);
-            store.SetCertificateEntry(friendlyName, certificateEntry);
-
-            // Add the private key.
-            store.SetKeyEntry(friendlyName, new AsymmetricKeyEntry(subjectKeyPair.Private), new[] { certificateEntry });
-
-            // Convert it to an X509Certificate2 object by saving/loading it from a MemoryStream.
-            // It needs a password. Since we'll remove this later, it doesn't particularly matter what we use.
-
-            var stream = new MemoryStream();
-            store.Save(stream, CertificatePassword.ToCharArray(), random);
-
-            var convertedCertificate =
-                new X509Certificate2(stream.ToArray(),
-                                     CertificatePassword,
-                                     X509KeyStorageFlags.PersistKeySet | X509KeyStorageFlags.Exportable);
-            return convertedCertificate;
-        }
-
-        public void WriteCertificate(X509Certificate2 certificate, string outputDirectory, string certName)
-        {
-            // This password is the one attached to the PFX file. Use 'null' for no password.
-            // Create PFX (PKCS #12) with private key
             try
             {
-                var pfx = certificate.Export(X509ContentType.Pfx, CertificatePassword);
-                File.WriteAllBytes(string.Format("{0}.pfx", Path.Combine(outputDirectory, certName)), pfx);
+                var contents = string.Format("-----BEGIN CERTIFICATE-----\r\n{0}\r\n-----END CERTIFICATE-----", Convert.ToBase64String(certificate.Export(X509ContentType.Cert), Base64FormattingOptions.InsertLineBreaks));
+                writer.Write(contents);
             }
             catch (Exception ex)
             {
-                CrestronConsole.PrintLine(string.Format("Failed to write x509 cert pfx\r\n{0}", ex.Message));
+                CrestronConsole.PrintLine(string.Format("Failed to write x509 cert cer\r\n{0}", ex.Message));
             }
-            // Create Base 64 encoded CER (public key only)
-            using (var writer = new StreamWriter($"{Path.Combine(outputDirectory, certName)}.cer", false))
-            {
-                try
-                {
-                    var contents = string.Format("-----BEGIN CERTIFICATE-----\r\n{0}\r\n-----END CERTIFICATE-----", Convert.ToBase64String(certificate.Export(X509ContentType.Cert), Base64FormattingOptions.InsertLineBreaks));
-                    writer.Write(contents);
-                }
-                catch (Exception ex)
-                {
-                    CrestronConsole.PrintLine(string.Format("Failed to write x509 cert cer\r\n{0}", ex.Message));
-                }
-            }
-        }
-        public bool AddCertToStore(X509Certificate2 cert, System.Security.Cryptography.X509Certificates.StoreName st, System.Security.Cryptography.X509Certificates.StoreLocation sl)
-        {
-            bool bRet = false;
-
-            try
-            {
-                var store = new System.Security.Cryptography.X509Certificates.X509Store(st, sl);
-                store.Open(System.Security.Cryptography.X509Certificates.OpenFlags.ReadWrite);
-                store.Add(cert);
-
-                store.Close();
-                bRet = true;
-            }
-            catch (Exception ex)
-            {
-                CrestronConsole.PrintLine(string.Format("AddCertToStore Failed\r\n{0}\r\n{1}", ex.Message, ex.StackTrace));
-            }
-
-            return bRet;
         }
     }
+    public bool AddCertToStore(X509Certificate2 cert, System.Security.Cryptography.X509Certificates.StoreName st, System.Security.Cryptography.X509Certificates.StoreLocation sl)
+    {
+        bool bRet = false;
+
+        try
+        {
+            var store = new System.Security.Cryptography.X509Certificates.X509Store(st, sl);
+            store.Open(System.Security.Cryptography.X509Certificates.OpenFlags.ReadWrite);
+            store.Add(cert);
+
+            store.Close();
+            bRet = true;
+        }
+        catch (Exception ex)
+        {
+            CrestronConsole.PrintLine(string.Format("AddCertToStore Failed\r\n{0}\r\n{1}", ex.Message, ex.StackTrace));
+        }
+
+        return bRet;
+    }
 }

src/PepperDash.Core/Web/RequestHandlers/DefaultRequestHandler.cs

@@ -1,7 +1,7 @@
 using Crestron.SimplSharp.WebScripting;
 
-namespace PepperDash.Core.Web.RequestHandlers
-{
+namespace PepperDash.Core.Web.RequestHandlers;
+
 	/// <summary>
 	/// Web API default request handler
 	/// </summary>
@@ -13,5 +13,4 @@ namespace PepperDash.Core.Web.RequestHandlers
 		public DefaultRequestHandler()
 			: base(true)
 		{ }
-	}
-}
+	}

src/PepperDash.Core/Web/RequestHandlers/WebApiBaseRequestAsyncHandler.cs

@@ -3,161 +3,160 @@ using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace PepperDash.Core.Web.RequestHandlers
+namespace PepperDash.Core.Web.RequestHandlers;
+
+public abstract class WebApiBaseRequestAsyncHandler:IHttpCwsHandler
 {
-    public abstract class WebApiBaseRequestAsyncHandler:IHttpCwsHandler
+    private readonly Dictionary<string, Func<HttpCwsContext, Task>> _handlers;
+    protected readonly bool EnableCors;
+
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    protected WebApiBaseRequestAsyncHandler(bool enableCors)
     {
-        private readonly Dictionary<string, Func<HttpCwsContext, Task>> _handlers;
-        protected readonly bool EnableCors;
+        EnableCors = enableCors;
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        protected WebApiBaseRequestAsyncHandler(bool enableCors)
+        _handlers = new Dictionary<string, Func<HttpCwsContext, Task>>
         {
-            EnableCors = enableCors;
+            {"CONNECT", HandleConnect},
+            {"DELETE", HandleDelete},
+            {"GET", HandleGet},
+            {"HEAD", HandleHead},
+            {"OPTIONS", HandleOptions},
+            {"PATCH", HandlePatch},
+            {"POST", HandlePost},
+            {"PUT", HandlePut},
+            {"TRACE", HandleTrace}
+        };
+    }
 
-            _handlers = new Dictionary<string, Func<HttpCwsContext, Task>>
-            {
-                {"CONNECT", HandleConnect},
-                {"DELETE", HandleDelete},
-                {"GET", HandleGet},
-                {"HEAD", HandleHead},
-                {"OPTIONS", HandleOptions},
-                {"PATCH", HandlePatch},
-                {"POST", HandlePost},
-                {"PUT", HandlePut},
-                {"TRACE", HandleTrace}
-            };
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    protected WebApiBaseRequestAsyncHandler()
+        : this(false)
+    {
+    }
+
+    /// <summary>
+    /// Handles CONNECT method requests
+    /// </summary>
+    /// <param name="context"></param>
+    protected virtual async Task HandleConnect(HttpCwsContext context)
+    {
+        context.Response.StatusCode = 501;
+        context.Response.StatusDescription = "Not Implemented";
+        context.Response.End();            
+    }
+
+    /// <summary>
+    /// Handles DELETE method requests
+    /// </summary>
+    /// <param name="context"></param>
+    protected virtual async Task HandleDelete(HttpCwsContext context)
+    {
+        context.Response.StatusCode = 501;
+        context.Response.StatusDescription = "Not Implemented";
+        context.Response.End();
+    }
+
+    /// <summary>
+    /// Handles GET method requests
+    /// </summary>
+    /// <param name="context"></param>
+    protected virtual async Task HandleGet(HttpCwsContext context)
+    {
+        context.Response.StatusCode = 501;
+        context.Response.StatusDescription = "Not Implemented";
+        context.Response.End();
+    }
+
+    /// <summary>
+    /// Handles HEAD method requests
+    /// </summary>
+    /// <param name="context"></param>
+    protected virtual async Task HandleHead(HttpCwsContext context)
+    {
+        context.Response.StatusCode = 501;
+        context.Response.StatusDescription = "Not Implemented";
+        context.Response.End();
+    }
+
+    /// <summary>
+    /// Handles OPTIONS method requests
+    /// </summary>
+    /// <param name="context"></param>
+    protected virtual async Task HandleOptions(HttpCwsContext context)
+    {
+        context.Response.StatusCode = 501;
+        context.Response.StatusDescription = "Not Implemented";
+        context.Response.End();
+    }
+
+    /// <summary>
+    /// Handles PATCH method requests
+    /// </summary>
+    /// <param name="context"></param>
+    protected virtual async Task HandlePatch(HttpCwsContext context)
+    {
+        context.Response.StatusCode = 501;
+        context.Response.StatusDescription = "Not Implemented";
+        context.Response.End();
+    }
+
+    /// <summary>
+    /// Handles POST method requests
+    /// </summary>
+    /// <param name="context"></param>
+    protected virtual async Task HandlePost(HttpCwsContext context)
+    {
+        context.Response.StatusCode = 501;
+        context.Response.StatusDescription = "Not Implemented";
+        context.Response.End();
+    }
+
+    /// <summary>
+    /// Handles PUT method requests
+    /// </summary>
+    /// <param name="context"></param>
+    protected virtual async Task HandlePut(HttpCwsContext context)
+    {
+        context.Response.StatusCode = 501;
+        context.Response.StatusDescription = "Not Implemented";
+        context.Response.End();
+    }
+
+    /// <summary>
+    /// Handles TRACE method requests
+    /// </summary>
+    /// <param name="context"></param>
+    protected virtual async Task HandleTrace(HttpCwsContext context)
+    {
+        context.Response.StatusCode = 501;
+        context.Response.StatusDescription = "Not Implemented";
+        context.Response.End();
+    }
+
+    /// <summary>
+    /// Process request
+    /// </summary>
+    /// <param name="context"></param>
+    public void ProcessRequest(HttpCwsContext context)
+    {
+        if (!_handlers.TryGetValue(context.Request.HttpMethod, out Func<HttpCwsContext, Task> handler))
+        {
+            return;
         }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        protected WebApiBaseRequestAsyncHandler()
-            : this(false)
+        if (EnableCors)
         {
+            context.Response.Headers.Add("Access-Control-Allow-Origin", "*");
+            context.Response.Headers.Add("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
         }
 
-        /// <summary>
-        /// Handles CONNECT method requests
-        /// </summary>
-        /// <param name="context"></param>
-        protected virtual async Task HandleConnect(HttpCwsContext context)
-        {
-            context.Response.StatusCode = 501;
-            context.Response.StatusDescription = "Not Implemented";
-            context.Response.End();            
-        }
+        var handlerTask = handler(context);
 
-        /// <summary>
-        /// Handles DELETE method requests
-        /// </summary>
-        /// <param name="context"></param>
-        protected virtual async Task HandleDelete(HttpCwsContext context)
-        {
-            context.Response.StatusCode = 501;
-            context.Response.StatusDescription = "Not Implemented";
-            context.Response.End();
-        }
-
-        /// <summary>
-        /// Handles GET method requests
-        /// </summary>
-        /// <param name="context"></param>
-        protected virtual async Task HandleGet(HttpCwsContext context)
-        {
-            context.Response.StatusCode = 501;
-            context.Response.StatusDescription = "Not Implemented";
-            context.Response.End();
-        }
-
-        /// <summary>
-        /// Handles HEAD method requests
-        /// </summary>
-        /// <param name="context"></param>
-        protected virtual async Task HandleHead(HttpCwsContext context)
-        {
-            context.Response.StatusCode = 501;
-            context.Response.StatusDescription = "Not Implemented";
-            context.Response.End();
-        }
-
-        /// <summary>
-        /// Handles OPTIONS method requests
-        /// </summary>
-        /// <param name="context"></param>
-        protected virtual async Task HandleOptions(HttpCwsContext context)
-        {
-            context.Response.StatusCode = 501;
-            context.Response.StatusDescription = "Not Implemented";
-            context.Response.End();
-        }
-
-        /// <summary>
-        /// Handles PATCH method requests
-        /// </summary>
-        /// <param name="context"></param>
-        protected virtual async Task HandlePatch(HttpCwsContext context)
-        {
-            context.Response.StatusCode = 501;
-            context.Response.StatusDescription = "Not Implemented";
-            context.Response.End();
-        }
-
-        /// <summary>
-        /// Handles POST method requests
-        /// </summary>
-        /// <param name="context"></param>
-        protected virtual async Task HandlePost(HttpCwsContext context)
-        {
-            context.Response.StatusCode = 501;
-            context.Response.StatusDescription = "Not Implemented";
-            context.Response.End();
-        }
-
-        /// <summary>
-        /// Handles PUT method requests
-        /// </summary>
-        /// <param name="context"></param>
-        protected virtual async Task HandlePut(HttpCwsContext context)
-        {
-            context.Response.StatusCode = 501;
-            context.Response.StatusDescription = "Not Implemented";
-            context.Response.End();
-        }
-
-        /// <summary>
-        /// Handles TRACE method requests
-        /// </summary>
-        /// <param name="context"></param>
-        protected virtual async Task HandleTrace(HttpCwsContext context)
-        {
-            context.Response.StatusCode = 501;
-            context.Response.StatusDescription = "Not Implemented";
-            context.Response.End();
-        }
-
-        /// <summary>
-        /// Process request
-        /// </summary>
-        /// <param name="context"></param>
-        public void ProcessRequest(HttpCwsContext context)
-        {
-            if (!_handlers.TryGetValue(context.Request.HttpMethod, out Func<HttpCwsContext, Task> handler))
-            {
-                return;
-            }
-
-            if (EnableCors)
-            {
-                context.Response.Headers.Add("Access-Control-Allow-Origin", "*");
-                context.Response.Headers.Add("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
-            }
-
-            var handlerTask = handler(context);
-
-            handlerTask.GetAwaiter().GetResult();
-        }
+        handlerTask.GetAwaiter().GetResult();
     }
 }

src/PepperDash.Core/Web/RequestHandlers/WebApiBaseRequestHandler.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using Crestron.SimplSharp.WebScripting;
 
-namespace PepperDash.Core.Web.RequestHandlers
-{
+namespace PepperDash.Core.Web.RequestHandlers;
+
 	/// <summary>
 	/// CWS Base Handler, implements IHttpCwsHandler
 	/// </summary>
@@ -161,5 +161,4 @@ namespace PepperDash.Core.Web.RequestHandlers
 
 			handler(context);
 		}
-	}
-}
+	}

src/PepperDash.Core/Web/WebApiServer.cs

@@ -7,8 +7,8 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core.Web.RequestHandlers;
 
-namespace PepperDash.Core.Web
-{
+namespace PepperDash.Core.Web;
+
 	/// <summary>
 	/// Web API server
 	/// </summary>
@@ -280,5 +280,4 @@ namespace PepperDash.Core.Web
 					Debug.Console(DebugVerbose, this, "ReceivedRequestEventHandler Exception InnerException: {0}", ex.InnerException);
 			}
 		}
-	}
-}
+	}

src/PepperDash.Core/WebApi/Presets/Preset.cs

@@ -1,45 +1,45 @@
 using System;
 
-namespace PepperDash.Core.WebApi.Presets
-{
-    /// <summary>
-    /// Represents a preset
-    /// </summary>
+namespace PepperDash.Core.WebApi.Presets;
+
+/// <summary>
+/// Represents a preset
+/// </summary>
 	public class Preset
 	{
-        /// <summary>
-        /// ID of preset
-        /// </summary>
+    /// <summary>
+    /// ID of preset
+    /// </summary>
 		public int Id { get; set; }
 
-        /// <summary>
-        /// User ID
-        /// </summary>
+    /// <summary>
+    /// User ID
+    /// </summary>
 		public int UserId { get; set; }
 
-        /// <summary>
-        /// Room Type ID
-        /// </summary>
+    /// <summary>
+    /// Room Type ID
+    /// </summary>
 		public int RoomTypeId { get; set; }
 
-        /// <summary>
-        /// Preset Name
-        /// </summary>
+    /// <summary>
+    /// Preset Name
+    /// </summary>
 		public string PresetName { get; set; }
 
-        /// <summary>
-        /// Preset Number
-        /// </summary>
+    /// <summary>
+    /// Preset Number
+    /// </summary>
 		public int PresetNumber { get; set; }
 
-        /// <summary>
-        /// Preset Data
-        /// </summary>
+    /// <summary>
+    /// Preset Data
+    /// </summary>
 		public string Data { get; set; }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
+    /// <summary>
+    /// Constructor
+    /// </summary>
 		public Preset()
 		{
 			PresetName = "";
@@ -53,35 +53,34 @@ namespace PepperDash.Core.WebApi.Presets
 	/// </summary>
 	public class PresetReceivedEventArgs : EventArgs
 	{
-        /// <summary>
-        /// True when the preset is found
-        /// </summary>
-        public bool LookupSuccess { get; private set; }
-        
-        /// <summary>
-        /// S+ helper
-        /// </summary>
-        public ushort ULookupSuccess { get { return (ushort)(LookupSuccess ? 1 : 0); } }
+    /// <summary>
+    /// True when the preset is found
+    /// </summary>
+    public bool LookupSuccess { get; private set; }
+    
+    /// <summary>
+    /// S+ helper
+    /// </summary>
+    public ushort ULookupSuccess { get { return (ushort)(LookupSuccess ? 1 : 0); } }
 
-        /// <summary>
-        /// The preset
-        /// </summary>
-        public Preset Preset { get; private set; }
+    /// <summary>
+    /// The preset
+    /// </summary>
+    public Preset Preset { get; private set; }
 
 		/// <summary>
 		/// For Simpl+
 		/// </summary>
 		public PresetReceivedEventArgs() { }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="preset"></param>
-        /// <param name="success"></param>
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    /// <param name="preset"></param>
+    /// <param name="success"></param>
 		public PresetReceivedEventArgs(Preset preset, bool success)
 		{
-            LookupSuccess = success;
+        LookupSuccess = success;
 			Preset = preset;
 		}
-	}
-}
+	}

src/PepperDash.Core/WebApi/Presets/User.cs

@@ -4,31 +4,31 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Core.WebApi.Presets
-{
+namespace PepperDash.Core.WebApi.Presets;
+
 	/// <summary>
 	/// 
 	/// </summary>
 	public class User
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int Id { get; set; }
 		
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string ExternalId { get; set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string FirstName { get; set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public string LastName { get; set; }
 	}
 
@@ -38,19 +38,19 @@ namespace PepperDash.Core.WebApi.Presets
 	/// </summary>
 	public class UserReceivedEventArgs : EventArgs
 	{
-        /// <summary>
-        /// True when user is found
-        /// </summary>
-        public bool LookupSuccess { get; private set; }
+    /// <summary>
+    /// True when user is found
+    /// </summary>
+    public bool LookupSuccess { get; private set; }
 
-        /// <summary>
-        /// For stupid S+
-        /// </summary>
-        public ushort ULookupSuccess { get { return (ushort)(LookupSuccess ? 1 : 0); } }
+    /// <summary>
+    /// For stupid S+
+    /// </summary>
+    public ushort ULookupSuccess { get { return (ushort)(LookupSuccess ? 1 : 0); } }
 
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public User User { get; private set; }
 
 		/// <summary>
@@ -58,14 +58,14 @@ namespace PepperDash.Core.WebApi.Presets
 		/// </summary>
 		public UserReceivedEventArgs() { }
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="user"></param>
-        /// <param name="success"></param>
+    /// <summary>
+    /// Constructor
+    /// </summary>
+    /// <param name="user"></param>
+    /// <param name="success"></param>
 		public UserReceivedEventArgs(User user, bool success)
 		{
-            LookupSuccess = success;
+        LookupSuccess = success;
 			User = user;
 		}
 	}
@@ -75,19 +75,18 @@ namespace PepperDash.Core.WebApi.Presets
 	/// </summary>
 	public class UserAndRoomMessage
 	{
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int UserId { get; set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int RoomTypeId { get; set; }
 
-        /// <summary>
-        /// 
-        /// </summary>
+    /// <summary>
+    /// 
+    /// </summary>
 		public int PresetNumber { get; set; }
-	}
-}
+	}

src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs

@@ -8,26 +8,26 @@ using Newtonsoft.Json.Linq;
 using PepperDash.Core.JsonToSimpl;
 
 
-namespace PepperDash.Core.WebApi.Presets
-{
-    /// <summary>
-    /// Passcode client for the WebApi
-    /// </summary>
+namespace PepperDash.Core.WebApi.Presets;
+
+/// <summary>
+/// Passcode client for the WebApi
+/// </summary>
 	public class WebApiPasscodeClient : IKeyed
 	{
-        /// <summary>
-        /// Notifies when user received
-        /// </summary>
+    /// <summary>
+    /// Notifies when user received
+    /// </summary>
 		public event EventHandler<UserReceivedEventArgs> UserReceived;
 
-        /// <summary>
-        /// Notifies when Preset received
-        /// </summary>
+    /// <summary>
+    /// Notifies when Preset received
+    /// </summary>
 		public event EventHandler<PresetReceivedEventArgs> PresetReceived;
 
-        /// <summary>
-        /// Unique identifier for this instance
-        /// </summary>
+    /// <summary>
+    /// Unique identifier for this instance
+    /// </summary>
 		public string Key { get; private set; }
 
 		//string JsonMasterKey;
@@ -54,13 +54,13 @@ namespace PepperDash.Core.WebApi.Presets
 		{
 		}
 
-        /// <summary>
-        /// Initializes the instance
-        /// </summary>
-        /// <param name="key"></param>
-        /// <param name="jsonMasterKey"></param>
-        /// <param name="urlBase"></param>
-        /// <param name="defaultPresetJsonFilePath"></param>
+    /// <summary>
+    /// Initializes the instance
+    /// </summary>
+    /// <param name="key"></param>
+    /// <param name="jsonMasterKey"></param>
+    /// <param name="urlBase"></param>
+    /// <param name="defaultPresetJsonFilePath"></param>
 		public void Initialize(string key, string jsonMasterKey, string urlBase, string defaultPresetJsonFilePath)
 		{
 			Key = key;
@@ -73,41 +73,41 @@ namespace PepperDash.Core.WebApi.Presets
 			J2SMaster.Initialize(jsonMasterKey);
 		}
 
-        /// <summary>
-        /// Gets the user for a passcode
-        /// </summary>
-        /// <param name="passcode"></param>
+    /// <summary>
+    /// Gets the user for a passcode
+    /// </summary>
+    /// <param name="passcode"></param>
 		public void GetUserForPasscode(string passcode)
 		{
-            // Bullshit duplicate code here... These two cases should be the same 
-            // except for https/http and the certificate ignores 
-            if (!UrlBase.StartsWith("https"))
-                return;
-            var req = new HttpsClientRequest();
-            req.Url = new UrlParser(UrlBase + "/api/users/dopin");
-            req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
-            req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
-            req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
-            var jo = new JObject();
-            jo.Add("pin", passcode);
-            req.ContentString = jo.ToString();
+        // Bullshit duplicate code here... These two cases should be the same 
+        // except for https/http and the certificate ignores 
+        if (!UrlBase.StartsWith("https"))
+            return;
+        var req = new HttpsClientRequest();
+        req.Url = new UrlParser(UrlBase + "/api/users/dopin");
+        req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
+        req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
+        req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
+        var jo = new JObject();
+        jo.Add("pin", passcode);
+        req.ContentString = jo.ToString();
 
-            var client = new HttpsClient();
-            client.HostVerification = false;
-            client.PeerVerification = false;
-            var resp = client.Dispatch(req);
-            var handler = UserReceived;
-            if (resp.Code == 200)
-            {
-                //CrestronConsole.PrintLine("Received: {0}", resp.ContentString);
-                var user = JsonConvert.DeserializeObject<User>(resp.ContentString);
-                CurrentUser = user;
-                if (handler != null)
-                    UserReceived(this, new UserReceivedEventArgs(user, true));
-            }
-            else
-                if (handler != null)
-                    UserReceived(this, new UserReceivedEventArgs(null, false));
+        var client = new HttpsClient();
+        client.HostVerification = false;
+        client.PeerVerification = false;
+        var resp = client.Dispatch(req);
+        var handler = UserReceived;
+        if (resp.Code == 200)
+        {
+            //CrestronConsole.PrintLine("Received: {0}", resp.ContentString);
+            var user = JsonConvert.DeserializeObject<User>(resp.ContentString);
+            CurrentUser = user;
+            if (handler != null)
+                UserReceived(this, new UserReceivedEventArgs(user, true));
+        }
+        else
+            if (handler != null)
+                UserReceived(this, new UserReceivedEventArgs(null, false));
 		}
 
 		/// <summary>
@@ -130,57 +130,57 @@ namespace PepperDash.Core.WebApi.Presets
 				PresetNumber = presetNumber
 			};
 
-            var handler = PresetReceived;
+        var handler = PresetReceived;
 			try
 			{
-                if (!UrlBase.StartsWith("https"))
-                    return;
-                var req = new HttpsClientRequest();
-                req.Url = new UrlParser(UrlBase + "/api/presets/userandroom");
-                req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
-                req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
-                req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
-                req.ContentString = JsonConvert.SerializeObject(msg);
+            if (!UrlBase.StartsWith("https"))
+                return;
+            var req = new HttpsClientRequest();
+            req.Url = new UrlParser(UrlBase + "/api/presets/userandroom");
+            req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
+            req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
+            req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
+            req.ContentString = JsonConvert.SerializeObject(msg);
 
-                var client = new HttpsClient();
-                client.HostVerification = false;
-                client.PeerVerification = false;
+            var client = new HttpsClient();
+            client.HostVerification = false;
+            client.PeerVerification = false;
 
-                // ask for the preset
-                var resp = client.Dispatch(req);
-                if (resp.Code == 200) // got it
+            // ask for the preset
+            var resp = client.Dispatch(req);
+            if (resp.Code == 200) // got it
+            {
+                //Debug.Console(1, this, "Received: {0}", resp.ContentString);
+                var preset = JsonConvert.DeserializeObject<Preset>(resp.ContentString);
+                CurrentPreset = preset;
+
+                //if there's no preset data, load the template
+                if (preset.Data == null || preset.Data.Trim() == string.Empty || JObject.Parse(preset.Data).Count == 0)
                 {
-                    //Debug.Console(1, this, "Received: {0}", resp.ContentString);
-                    var preset = JsonConvert.DeserializeObject<Preset>(resp.ContentString);
-                    CurrentPreset = preset;
-
-                    //if there's no preset data, load the template
-                    if (preset.Data == null || preset.Data.Trim() == string.Empty || JObject.Parse(preset.Data).Count == 0)
-                    {
-                        //Debug.Console(1, this, "Loaded preset has no data. Loading default template.");
-                        LoadDefaultPresetData();
-                        return;
-                    }
-
-                    J2SMaster.LoadWithJson(preset.Data);
-                    if (handler != null)
-                        PresetReceived(this, new PresetReceivedEventArgs(preset, true));
-                }
-                else // no existing preset
-                {
-                    CurrentPreset = new Preset();
+                    //Debug.Console(1, this, "Loaded preset has no data. Loading default template.");
                     LoadDefaultPresetData();
-                    if (handler != null)
-                        PresetReceived(this, new PresetReceivedEventArgs(null, false));
+                    return;
                 }
+
+                J2SMaster.LoadWithJson(preset.Data);
+                if (handler != null)
+                    PresetReceived(this, new PresetReceivedEventArgs(preset, true));
+            }
+            else // no existing preset
+            {
+                CurrentPreset = new Preset();
+                LoadDefaultPresetData();
+                if (handler != null)
+                    PresetReceived(this, new PresetReceivedEventArgs(null, false));
+            }
 			}
 			catch (HttpException e)
 			{
 				var resp = e.Response;
 				Debug.Console(1, this, "No preset received (code {0}). Loading default template", resp.Code);
 				LoadDefaultPresetData();
-                if (handler != null)
-                    PresetReceived(this, new PresetReceivedEventArgs(null, false));
+            if (handler != null)
+                PresetReceived(this, new PresetReceivedEventArgs(null, false));
 			}
 		}
 
@@ -236,8 +236,8 @@ namespace PepperDash.Core.WebApi.Presets
 		{
 			CurrentPreset.Data = json;
 
-            if (!UrlBase.StartsWith("https"))
-                return;
+        if (!UrlBase.StartsWith("https"))
+            return;
 			var req = new HttpsClientRequest();
 			req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
 			req.Url = new UrlParser(string.Format("{0}/api/presets/addorchange", UrlBase));
@@ -246,8 +246,8 @@ namespace PepperDash.Core.WebApi.Presets
 			req.ContentString = JsonConvert.SerializeObject(CurrentPreset);
 
 			var client = new HttpsClient();
-            client.HostVerification = false;
-            client.PeerVerification = false;
+        client.HostVerification = false;
+        client.PeerVerification = false;
 			try
 			{
 				var resp = client.Dispatch(req);
@@ -270,4 +270,3 @@ namespace PepperDash.Core.WebApi.Presets
 			}
 		}
 	}
-}

src/PepperDash.Core/XSigUtility/Serialization/IXSigSerialization.cs

@@ -1,25 +1,24 @@
 using System.Collections.Generic;
 using PepperDash.Core.Intersystem.Tokens;
 
-namespace PepperDash.Core.Intersystem.Serialization
+namespace PepperDash.Core.Intersystem.Serialization;
+
+/// <summary>
+/// Interface to determine XSig serialization for an object.
+/// </summary>
+public interface IXSigSerialization
 {
     /// <summary>
-    /// Interface to determine XSig serialization for an object.
+    /// Serialize the sig data
     /// </summary>
-    public interface IXSigSerialization
-    {
-        /// <summary>
-        /// Serialize the sig data
-        /// </summary>
-        /// <returns></returns>
-        IEnumerable<XSigToken> Serialize();
+    /// <returns></returns>
+    IEnumerable<XSigToken> Serialize();
 
-        /// <summary>
-        /// Deserialize the sig data
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="tokens"></param>
-        /// <returns></returns>
-        T Deserialize<T>(IEnumerable<XSigToken> tokens) where T : class, IXSigSerialization;
-    }
+    /// <summary>
+    /// Deserialize the sig data
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="tokens"></param>
+    /// <returns></returns>
+    T Deserialize<T>(IEnumerable<XSigToken> tokens) where T : class, IXSigSerialization;
 }

src/PepperDash.Core/XSigUtility/Serialization/XSigSerializationException.cs

@@ -1,28 +1,27 @@
 using System;
 
-namespace PepperDash.Core.Intersystem.Serialization
+namespace PepperDash.Core.Intersystem.Serialization;
+
+/// <summary>
+/// Class to handle this specific exception type
+/// </summary>
+public class XSigSerializationException : Exception
 {
     /// <summary>
-    /// Class to handle this specific exception type
+    /// default constructor
     /// </summary>
-    public class XSigSerializationException : Exception
-    {
-        /// <summary>
-        /// default constructor
-        /// </summary>
-        public XSigSerializationException() { }
+    public XSigSerializationException() { }
 
-        /// <summary>
-        /// constructor with message
-        /// </summary>
-        /// <param name="message"></param>
-        public XSigSerializationException(string message) : base(message) { }
+    /// <summary>
+    /// constructor with message
+    /// </summary>
+    /// <param name="message"></param>
+    public XSigSerializationException(string message) : base(message) { }
 
-        /// <summary>
-        /// constructor with message and innner exception
-        /// </summary>
-        /// <param name="message"></param>
-        /// <param name="inner"></param>
-        public XSigSerializationException(string message, Exception inner) : base(message, inner) { }
-    }
+    /// <summary>
+    /// constructor with message and innner exception
+    /// </summary>
+    /// <param name="message"></param>
+    /// <param name="inner"></param>
+    public XSigSerializationException(string message, Exception inner) : base(message, inner) { }
 }

src/PepperDash.Core/XSigUtility/Tokens/XSigAnalogToken.cs

@@ -1,88 +1,87 @@
 using System;
 
-namespace PepperDash.Core.Intersystem.Tokens
+namespace PepperDash.Core.Intersystem.Tokens;
+
+/// <summary>
+/// Represents an XSigAnalogToken
+/// </summary>
+public sealed class XSigAnalogToken : XSigToken, IFormattable
 {
+    private readonly ushort _value;
+
     /// <summary>
-    /// Represents an XSigAnalogToken
+    /// Constructor
     /// </summary>
-    public sealed class XSigAnalogToken : XSigToken, IFormattable
+    /// <param name="index"></param>
+    /// <param name="value"></param>
+    public XSigAnalogToken(int index, ushort value)
+        : base(index)
     {
-        private readonly ushort _value;
+        // 10-bits available for analog encoded data
+        if (index >= 1024 || index < 0)
+            throw new ArgumentOutOfRangeException("index");
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="value"></param>
-        public XSigAnalogToken(int index, ushort value)
-            : base(index)
-        {
-            // 10-bits available for analog encoded data
-            if (index >= 1024 || index < 0)
-                throw new ArgumentOutOfRangeException("index");
+        _value = value;
+    }
 
-            _value = value;
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    public ushort Value
+    {
+        get { return _value; }
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public ushort Value
-        {
-            get { return _value; }
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    public override XSigTokenType TokenType
+    {
+        get { return XSigTokenType.Analog; }
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public override XSigTokenType TokenType
-        {
-            get { return XSigTokenType.Analog; }
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public override byte[] GetBytes()
+    {
+        return new[] {
+            (byte)(0xC0 | ((Value & 0xC000) >> 10) | (Index - 1 >> 7)),
+            (byte)((Index - 1) & 0x7F),
+            (byte)((Value & 0x3F80) >> 7),
+            (byte)(Value & 0x7F)
+        };
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public override byte[] GetBytes()
-        {
-            return new[] {
-                (byte)(0xC0 | ((Value & 0xC000) >> 10) | (Index - 1 >> 7)),
-                (byte)((Index - 1) & 0x7F),
-                (byte)((Value & 0x3F80) >> 7),
-                (byte)(Value & 0x7F)
-            };
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="offset"></param>
+    /// <returns></returns>
+    public override XSigToken GetTokenWithOffset(int offset)
+    {
+        if (offset == 0) return this;
+        return new XSigAnalogToken(Index + offset, Value);
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="offset"></param>
-        /// <returns></returns>
-        public override XSigToken GetTokenWithOffset(int offset)
-        {
-            if (offset == 0) return this;
-            return new XSigAnalogToken(Index + offset, Value);
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public override string ToString()
+    {
+        return Index + " = 0x" + Value.ToString("X4");
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return Index + " = 0x" + Value.ToString("X4");
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="format"></param>
-        /// <param name="formatProvider"></param>
-        /// <returns></returns>
-        public string ToString(string format, IFormatProvider formatProvider)
-        {
-            return Value.ToString(format, formatProvider);
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="format"></param>
+    /// <param name="formatProvider"></param>
+    /// <returns></returns>
+    public string ToString(string format, IFormatProvider formatProvider)
+    {
+        return Value.ToString(format, formatProvider);
     }
 }

src/PepperDash.Core/XSigUtility/Tokens/XSigDigitalToken.cs

@@ -1,85 +1,84 @@
 using System;
 
-namespace PepperDash.Core.Intersystem.Tokens
+namespace PepperDash.Core.Intersystem.Tokens;
+
+/// <summary>
+/// Represents an XSigDigitalToken
+/// </summary>
+public sealed class XSigDigitalToken : XSigToken
 {
+    private readonly bool _value;
+
     /// <summary>
-    /// Represents an XSigDigitalToken
+    /// 
     /// </summary>
-    public sealed class XSigDigitalToken : XSigToken
+    /// <param name="index"></param>
+    /// <param name="value"></param>
+    public XSigDigitalToken(int index, bool value)
+        : base(index)
     {
-        private readonly bool _value;
+        // 12-bits available for digital encoded data
+        if (index >= 4096 || index < 0)
+            throw new ArgumentOutOfRangeException("index");
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="value"></param>
-        public XSigDigitalToken(int index, bool value)
-            : base(index)
-        {
-            // 12-bits available for digital encoded data
-            if (index >= 4096 || index < 0)
-                throw new ArgumentOutOfRangeException("index");
+        _value = value;
+    }
 
-            _value = value;
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    public bool Value
+    {
+        get { return _value; }
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public bool Value
-        {
-            get { return _value; }
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    public override XSigTokenType TokenType
+    {
+        get { return XSigTokenType.Digital; }
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public override XSigTokenType TokenType
-        {
-            get { return XSigTokenType.Digital; }
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public override byte[] GetBytes()
+    {
+        return new[] {
+            (byte)(0x80 | (Value ? 0 : 0x20) | ((Index - 1) >> 7)),
+            (byte)((Index - 1) & 0x7F)
+        };
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public override byte[] GetBytes()
-        {
-            return new[] {
-                (byte)(0x80 | (Value ? 0 : 0x20) | ((Index - 1) >> 7)),
-                (byte)((Index - 1) & 0x7F)
-            };
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="offset"></param>
+    /// <returns></returns>
+    public override XSigToken GetTokenWithOffset(int offset)
+    {
+        if (offset == 0) return this;
+        return new XSigDigitalToken(Index + offset, Value);
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="offset"></param>
-        /// <returns></returns>
-        public override XSigToken GetTokenWithOffset(int offset)
-        {
-            if (offset == 0) return this;
-            return new XSigDigitalToken(Index + offset, Value);
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public override string ToString()
+    {
+        return Index + " = " + (Value ? "High" : "Low");
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return Index + " = " + (Value ? "High" : "Low");
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="formatProvider"></param>
-        /// <returns></returns>
-        public string ToString(IFormatProvider formatProvider)
-        {
-            return Value.ToString(formatProvider);
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="formatProvider"></param>
+    /// <returns></returns>
+    public string ToString(IFormatProvider formatProvider)
+    {
+        return Value.ToString(formatProvider);
     }
 }

src/PepperDash.Core/XSigUtility/Tokens/XSigSerialToken.cs

@@ -1,81 +1,80 @@
 using System;
 using System.Text;
 
-namespace PepperDash.Core.Intersystem.Tokens
+namespace PepperDash.Core.Intersystem.Tokens;
+
+/// <summary>
+/// Represents an XSigSerialToken
+/// </summary>
+public sealed class XSigSerialToken : XSigToken
 {
+    private readonly string _value;
+
     /// <summary>
-    /// Represents an XSigSerialToken
+    /// Constructor
     /// </summary>
-    public sealed class XSigSerialToken : XSigToken
+    /// <param name="index"></param>
+    /// <param name="value"></param>
+    public XSigSerialToken(int index, string value)
+        : base(index)
     {
-        private readonly string _value;
+        // 10-bits available for serial encoded data
+        if (index >= 1024 || index < 0)
+            throw new ArgumentOutOfRangeException("index");
 
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="index"></param>
-        /// <param name="value"></param>
-        public XSigSerialToken(int index, string value)
-            : base(index)
-        {
-            // 10-bits available for serial encoded data
-            if (index >= 1024 || index < 0)
-                throw new ArgumentOutOfRangeException("index");
+        _value = value;
+    }
 
-            _value = value;
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    public string Value
+    {
+        get { return _value; }
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public string Value
-        {
-            get { return _value; }
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    public override XSigTokenType TokenType
+    {
+        get { return XSigTokenType.Serial; }
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public override XSigTokenType TokenType
-        {
-            get { return XSigTokenType.Serial; }
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public override byte[] GetBytes()
+    {
+        var serialBytes = String.IsNullOrEmpty(Value) ? new byte[0] : Encoding.GetEncoding(28591).GetBytes(Value);
+        
+        var xsig = new byte[serialBytes.Length + 3];
+        xsig[0] = (byte)(0xC8 | (Index - 1 >> 7));
+        xsig[1] = (byte)((Index - 1) & 0x7F);
+        xsig[xsig.Length - 1] = 0xFF;
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public override byte[] GetBytes()
-        {
-            var serialBytes = String.IsNullOrEmpty(Value) ? new byte[0] : Encoding.GetEncoding(28591).GetBytes(Value);
-            
-            var xsig = new byte[serialBytes.Length + 3];
-            xsig[0] = (byte)(0xC8 | (Index - 1 >> 7));
-            xsig[1] = (byte)((Index - 1) & 0x7F);
-            xsig[xsig.Length - 1] = 0xFF;
+        Buffer.BlockCopy(serialBytes, 0, xsig, 2, serialBytes.Length);
+        return xsig;
+    }
 
-            Buffer.BlockCopy(serialBytes, 0, xsig, 2, serialBytes.Length);
-            return xsig;
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="offset"></param>
+    /// <returns></returns>
+    public override XSigToken GetTokenWithOffset(int offset)
+    {
+        if (offset == 0) return this;
+        return new XSigSerialToken(Index + offset, Value);
+    }
 
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="offset"></param>
-        /// <returns></returns>
-        public override XSigToken GetTokenWithOffset(int offset)
-        {
-            if (offset == 0) return this;
-            return new XSigSerialToken(Index + offset, Value);
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            return Index + " = \"" + Value + "\"";
-        }
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <returns></returns>
+    public override string ToString()
+    {
+        return Index + " = \"" + Value + "\"";
     }
 }

src/PepperDash.Core/XSigUtility/Tokens/XSigToken.cs

@@ -1,45 +1,44 @@
-namespace PepperDash.Core.Intersystem.Tokens
+namespace PepperDash.Core.Intersystem.Tokens;
+
+/// <summary>
+/// Represents the base class for all XSig datatypes.
+/// </summary>
+public abstract class XSigToken
 {
+    private readonly int _index;
+
     /// <summary>
-    /// Represents the base class for all XSig datatypes.
+    /// Constructs an XSigToken with the specified index.
     /// </summary>
-    public abstract class XSigToken
+    /// <param name="index">Index for the data.</param>
+    protected XSigToken(int index)
     {
-        private readonly int _index;
-
-        /// <summary>
-        /// Constructs an XSigToken with the specified index.
-        /// </summary>
-        /// <param name="index">Index for the data.</param>
-        protected XSigToken(int index)
-        {
-            _index = index;
-        }
-
-        /// <summary>
-        /// XSig 1-based index.
-        /// </summary>
-        public int Index
-        {
-            get { return _index; }
-        }
-
-        /// <summary>
-        /// XSigToken type.
-        /// </summary>
-        public abstract XSigTokenType TokenType { get; }
-
-        /// <summary>
-        /// Generates the XSig bytes for the corresponding token.
-        /// </summary>
-        /// <returns>XSig byte array.</returns>
-        public abstract byte[] GetBytes();
-
-        /// <summary>
-        /// Returns a new token if necessary with an updated index based on the specified offset.
-        /// </summary>
-        /// <param name="offset">Offset to adjust the index with.</param>
-        /// <returns>XSigToken</returns>
-        public abstract XSigToken GetTokenWithOffset(int offset);
+        _index = index;
     }
+
+    /// <summary>
+    /// XSig 1-based index.
+    /// </summary>
+    public int Index
+    {
+        get { return _index; }
+    }
+
+    /// <summary>
+    /// XSigToken type.
+    /// </summary>
+    public abstract XSigTokenType TokenType { get; }
+
+    /// <summary>
+    /// Generates the XSig bytes for the corresponding token.
+    /// </summary>
+    /// <returns>XSig byte array.</returns>
+    public abstract byte[] GetBytes();
+
+    /// <summary>
+    /// Returns a new token if necessary with an updated index based on the specified offset.
+    /// </summary>
+    /// <param name="offset">Offset to adjust the index with.</param>
+    /// <returns>XSigToken</returns>
+    public abstract XSigToken GetTokenWithOffset(int offset);
 }

src/PepperDash.Core/XSigUtility/Tokens/XSigTokenType.cs

@@ -1,23 +1,22 @@
-namespace PepperDash.Core.Intersystem.Tokens
+namespace PepperDash.Core.Intersystem.Tokens;
+
+/// <summary>
+/// XSig token types.
+/// </summary>
+public enum XSigTokenType
 {
     /// <summary>
-    /// XSig token types.
+    /// Digital signal datatype.
     /// </summary>
-    public enum XSigTokenType
-    {
-        /// <summary>
-        /// Digital signal datatype.
-        /// </summary>
-        Digital,
+    Digital,
 
-        /// <summary>
-        /// Analog signal datatype.
-        /// </summary>
-        Analog,
+    /// <summary>
+    /// Analog signal datatype.
+    /// </summary>
+    Analog,
 
-        /// <summary>
-        /// Serial signal datatype.
-        /// </summary>
-        Serial
-    }
+    /// <summary>
+    /// Serial signal datatype.
+    /// </summary>
+    Serial
 }

src/PepperDash.Core/XSigUtility/XSigHelpers.cs

@@ -18,222 +18,221 @@ using PepperDash.Core.Intersystem.Tokens;
         11111111 <- denotes end of data
 */
 
-namespace PepperDash.Core.Intersystem
+namespace PepperDash.Core.Intersystem;
+
+/// <summary>
+/// Helper methods for creating XSig byte sequences compatible with the Intersystem Communications (ISC) symbol.
+/// </summary>
+/// <remarks>
+/// Indexing is not from the start of each signal type but rather from the beginning of the first defined signal
+/// the Intersystem Communications (ISC) symbol.
+/// </remarks>
+public static class XSigHelpers
 {
     /// <summary>
-    /// Helper methods for creating XSig byte sequences compatible with the Intersystem Communications (ISC) symbol.
+    /// Forces all outputs to 0.
     /// </summary>
-    /// <remarks>
-    /// Indexing is not from the start of each signal type but rather from the beginning of the first defined signal
-    /// the Intersystem Communications (ISC) symbol.
-    /// </remarks>
-    public static class XSigHelpers
+    /// <returns>Bytes in XSig format for clear outputs trigger.</returns>
+    public static byte[] ClearOutputs()
     {
-        /// <summary>
-        /// Forces all outputs to 0.
-        /// </summary>
-        /// <returns>Bytes in XSig format for clear outputs trigger.</returns>
-        public static byte[] ClearOutputs()
+        return new byte[] { 0xFC };
+    }
+
+    /// <summary>
+    /// Evaluate all inputs and re-transmit any digital, analog, and permanent serail signals not set to 0.
+    /// </summary>
+    /// <returns>Bytes in XSig format for send status trigger.</returns>
+    public static byte[] SendStatus()
+    {
+        return new byte[] { 0xFD };
+    }
+
+    /// <summary>
+    /// Get bytes for an IXSigStateResolver object.
+    /// </summary>
+    /// <param name="xSigSerialization">XSig state resolver.</param>
+    /// <returns>Bytes in XSig format for each token within the state representation.</returns>
+    public static byte[] GetBytes(IXSigSerialization xSigSerialization)
+    {
+        return GetBytes(xSigSerialization, 0);
+    }
+
+    /// <summary>
+    /// Get bytes for an IXSigStateResolver object, with a specified offset.
+    /// </summary>
+    /// <param name="xSigSerialization">XSig state resolver.</param>
+    /// <param name="offset">Offset to which the data will be aligned.</param>
+    /// <returns>Bytes in XSig format for each token within the state representation.</returns>
+    public static byte[] GetBytes(IXSigSerialization xSigSerialization, int offset)
+    {
+        var tokens = xSigSerialization.Serialize();
+        if (tokens == null) return new byte[0];
+        using (var memoryStream = new MemoryStream())
         {
-            return new byte[] { 0xFC };
-        }
+            using (var tokenWriter = new XSigTokenStreamWriter(memoryStream))
+                tokenWriter.WriteXSigData(xSigSerialization, offset);
 
-        /// <summary>
-        /// Evaluate all inputs and re-transmit any digital, analog, and permanent serail signals not set to 0.
-        /// </summary>
-        /// <returns>Bytes in XSig format for send status trigger.</returns>
-        public static byte[] SendStatus()
-        {
-            return new byte[] { 0xFD };
-        }
-
-        /// <summary>
-        /// Get bytes for an IXSigStateResolver object.
-        /// </summary>
-        /// <param name="xSigSerialization">XSig state resolver.</param>
-        /// <returns>Bytes in XSig format for each token within the state representation.</returns>
-        public static byte[] GetBytes(IXSigSerialization xSigSerialization)
-        {
-            return GetBytes(xSigSerialization, 0);
-        }
-
-        /// <summary>
-        /// Get bytes for an IXSigStateResolver object, with a specified offset.
-        /// </summary>
-        /// <param name="xSigSerialization">XSig state resolver.</param>
-        /// <param name="offset">Offset to which the data will be aligned.</param>
-        /// <returns>Bytes in XSig format for each token within the state representation.</returns>
-        public static byte[] GetBytes(IXSigSerialization xSigSerialization, int offset)
-        {
-            var tokens = xSigSerialization.Serialize();
-            if (tokens == null) return new byte[0];
-            using (var memoryStream = new MemoryStream())
-            {
-                using (var tokenWriter = new XSigTokenStreamWriter(memoryStream))
-                    tokenWriter.WriteXSigData(xSigSerialization, offset);
-
-                return memoryStream.ToArray();
-            }
-        }
-
-        /// <summary>
-        /// Get bytes for a single digital signal.
-        /// </summary>
-        /// <param name="index">1-based digital index</param>
-        /// <param name="value">Digital data to be encoded</param>
-        /// <returns>Bytes in XSig format for digtial information.</returns>
-        public static byte[] GetBytes(int index, bool value)
-        {
-            return GetBytes(index, 0, value);
-        }
-
-        /// <summary>
-        /// Get bytes for a single digital signal.
-        /// </summary>
-        /// <param name="index">1-based digital index</param>
-        /// <param name="offset">Index offset.</param>
-        /// <param name="value">Digital data to be encoded</param>
-        /// <returns>Bytes in XSig format for digtial information.</returns>
-        public static byte[] GetBytes(int index, int offset, bool value)
-        {
-            return new XSigDigitalToken(index + offset, value).GetBytes();
-        }
-
-        /// <summary>
-        /// Get byte sequence for multiple digital signals.
-        /// </summary>
-        /// <param name="startIndex">Starting index of the sequence.</param>
-        /// <param name="values">Digital signal value array.</param>
-        /// <returns>Byte sequence in XSig format for digital signal information.</returns>
-        public static byte[] GetBytes(int startIndex, bool[] values)
-        {
-            return GetBytes(startIndex, 0, values);
-        }
-
-        /// <summary>
-        /// Get byte sequence for multiple digital signals.
-        /// </summary>
-        /// <param name="startIndex">Starting index of the sequence.</param>
-        /// <param name="offset">Index offset.</param>
-        /// <param name="values">Digital signal value array.</param>
-        /// <returns>Byte sequence in XSig format for digital signal information.</returns>
-        public static byte[] GetBytes(int startIndex, int offset, bool[] values)
-        {
-            // Digital XSig data is 2 bytes per value
-            const int fixedLength = 2;
-            var bytes = new byte[values.Length * fixedLength];
-            for (var i = 0; i < values.Length; i++)
-                Buffer.BlockCopy(GetBytes(startIndex++, offset, values[i]), 0, bytes, i * fixedLength, fixedLength);
-
-            return bytes;
-        }
-
-        /// <summary>
-        /// Get bytes for a single analog signal.
-        /// </summary>
-        /// <param name="index">1-based analog index</param>
-        /// <param name="value">Analog data to be encoded</param>
-        /// <returns>Bytes in XSig format for analog signal information.</returns>
-        public static byte[] GetBytes(int index, ushort value)
-        {
-            return GetBytes(index, 0, value);
-        }
-
-        /// <summary>
-        /// Get bytes for a single analog signal.
-        /// </summary>
-        /// <param name="index">1-based analog index</param>
-        /// <param name="offset">Index offset.</param>
-        /// <param name="value">Analog data to be encoded</param>
-        /// <returns>Bytes in XSig format for analog signal information.</returns>
-        public static byte[] GetBytes(int index, int offset, ushort value)
-        {
-            return new XSigAnalogToken(index + offset, value).GetBytes();
-        }
-
-        /// <summary>
-        /// Get byte sequence for multiple analog signals.
-        /// </summary>
-        /// <param name="startIndex">Starting index of the sequence.</param>
-        /// <param name="values">Analog signal value array.</param>
-        /// <returns>Byte sequence in XSig format for analog signal information.</returns>
-        public static byte[] GetBytes(int startIndex, ushort[] values)
-        {
-            return GetBytes(startIndex, 0, values);
-        }
-
-        /// <summary>
-        /// Get byte sequence for multiple analog signals.
-        /// </summary>
-        /// <param name="startIndex">Starting index of the sequence.</param>
-        /// <param name="offset">Index offset.</param>
-        /// <param name="values">Analog signal value array.</param>
-        /// <returns>Byte sequence in XSig format for analog signal information.</returns>
-        public static byte[] GetBytes(int startIndex, int offset, ushort[] values)
-        {
-            // Analog XSig data is 4 bytes per value
-            const int fixedLength = 4;
-            var bytes = new byte[values.Length * fixedLength];
-            for (var i = 0; i < values.Length; i++)
-                Buffer.BlockCopy(GetBytes(startIndex++, offset, values[i]), 0, bytes, i * fixedLength, fixedLength);
-
-            return bytes;
-        }
-
-        /// <summary>
-        /// Get bytes for a single serial signal.
-        /// </summary>
-        /// <param name="index">1-based serial index</param>
-        /// <param name="value">Serial data to be encoded</param>
-        /// <returns>Bytes in XSig format for serial signal information.</returns>
-        public static byte[] GetBytes(int index, string value)
-        {
-            return GetBytes(index, 0, value);
-        }
-
-        /// <summary>
-        /// Get bytes for a single serial signal.
-        /// </summary>
-        /// <param name="index">1-based serial index</param>
-        /// <param name="offset">Index offset.</param>
-        /// <param name="value">Serial data to be encoded</param>
-        /// <returns>Bytes in XSig format for serial signal information.</returns>
-        public static byte[] GetBytes(int index, int offset, string value)
-        {
-            return new XSigSerialToken(index + offset, value).GetBytes();
-        }
-
-        /// <summary>
-        /// Get byte sequence for multiple serial signals.
-        /// </summary>
-        /// <param name="startIndex">Starting index of the sequence.</param>
-        /// <param name="values">Serial signal value array.</param>
-        /// <returns>Byte sequence in XSig format for serial signal information.</returns>
-        public static byte[] GetBytes(int startIndex, string[] values)
-        {
-            return GetBytes(startIndex, 0, values);
-        }
-
-        /// <summary>
-        /// Get byte sequence for multiple serial signals.
-        /// </summary>
-        /// <param name="startIndex">Starting index of the sequence.</param>
-        /// <param name="offset">Index offset.</param>
-        /// <param name="values">Serial signal value array.</param>
-        /// <returns>Byte sequence in XSig format for serial signal information.</returns>
-        public static byte[] GetBytes(int startIndex, int offset, string[] values)
-        {
-            // Serial XSig data is not fixed-length like the other formats
-            var dstOffset = 0;
-            var bytes = new byte[values.Sum(v => v.Length + 3)];
-            for (var i = 0; i < values.Length; i++)
-            {
-                var data = GetBytes(startIndex++, offset, values[i]);
-                Buffer.BlockCopy(data, 0, bytes, dstOffset, data.Length);
-                dstOffset += data.Length;
-            }
-
-            return bytes;
+            return memoryStream.ToArray();
         }
     }
+
+    /// <summary>
+    /// Get bytes for a single digital signal.
+    /// </summary>
+    /// <param name="index">1-based digital index</param>
+    /// <param name="value">Digital data to be encoded</param>
+    /// <returns>Bytes in XSig format for digtial information.</returns>
+    public static byte[] GetBytes(int index, bool value)
+    {
+        return GetBytes(index, 0, value);
+    }
+
+    /// <summary>
+    /// Get bytes for a single digital signal.
+    /// </summary>
+    /// <param name="index">1-based digital index</param>
+    /// <param name="offset">Index offset.</param>
+    /// <param name="value">Digital data to be encoded</param>
+    /// <returns>Bytes in XSig format for digtial information.</returns>
+    public static byte[] GetBytes(int index, int offset, bool value)
+    {
+        return new XSigDigitalToken(index + offset, value).GetBytes();
+    }
+
+    /// <summary>
+    /// Get byte sequence for multiple digital signals.
+    /// </summary>
+    /// <param name="startIndex">Starting index of the sequence.</param>
+    /// <param name="values">Digital signal value array.</param>
+    /// <returns>Byte sequence in XSig format for digital signal information.</returns>
+    public static byte[] GetBytes(int startIndex, bool[] values)
+    {
+        return GetBytes(startIndex, 0, values);
+    }
+
+    /// <summary>
+    /// Get byte sequence for multiple digital signals.
+    /// </summary>
+    /// <param name="startIndex">Starting index of the sequence.</param>
+    /// <param name="offset">Index offset.</param>
+    /// <param name="values">Digital signal value array.</param>
+    /// <returns>Byte sequence in XSig format for digital signal information.</returns>
+    public static byte[] GetBytes(int startIndex, int offset, bool[] values)
+    {
+        // Digital XSig data is 2 bytes per value
+        const int fixedLength = 2;
+        var bytes = new byte[values.Length * fixedLength];
+        for (var i = 0; i < values.Length; i++)
+            Buffer.BlockCopy(GetBytes(startIndex++, offset, values[i]), 0, bytes, i * fixedLength, fixedLength);
+
+        return bytes;
+    }
+
+    /// <summary>
+    /// Get bytes for a single analog signal.
+    /// </summary>
+    /// <param name="index">1-based analog index</param>
+    /// <param name="value">Analog data to be encoded</param>
+    /// <returns>Bytes in XSig format for analog signal information.</returns>
+    public static byte[] GetBytes(int index, ushort value)
+    {
+        return GetBytes(index, 0, value);
+    }
+
+    /// <summary>
+    /// Get bytes for a single analog signal.
+    /// </summary>
+    /// <param name="index">1-based analog index</param>
+    /// <param name="offset">Index offset.</param>
+    /// <param name="value">Analog data to be encoded</param>
+    /// <returns>Bytes in XSig format for analog signal information.</returns>
+    public static byte[] GetBytes(int index, int offset, ushort value)
+    {
+        return new XSigAnalogToken(index + offset, value).GetBytes();
+    }
+
+    /// <summary>
+    /// Get byte sequence for multiple analog signals.
+    /// </summary>
+    /// <param name="startIndex">Starting index of the sequence.</param>
+    /// <param name="values">Analog signal value array.</param>
+    /// <returns>Byte sequence in XSig format for analog signal information.</returns>
+    public static byte[] GetBytes(int startIndex, ushort[] values)
+    {
+        return GetBytes(startIndex, 0, values);
+    }
+
+    /// <summary>
+    /// Get byte sequence for multiple analog signals.
+    /// </summary>
+    /// <param name="startIndex">Starting index of the sequence.</param>
+    /// <param name="offset">Index offset.</param>
+    /// <param name="values">Analog signal value array.</param>
+    /// <returns>Byte sequence in XSig format for analog signal information.</returns>
+    public static byte[] GetBytes(int startIndex, int offset, ushort[] values)
+    {
+        // Analog XSig data is 4 bytes per value
+        const int fixedLength = 4;
+        var bytes = new byte[values.Length * fixedLength];
+        for (var i = 0; i < values.Length; i++)
+            Buffer.BlockCopy(GetBytes(startIndex++, offset, values[i]), 0, bytes, i * fixedLength, fixedLength);
+
+        return bytes;
+    }
+
+    /// <summary>
+    /// Get bytes for a single serial signal.
+    /// </summary>
+    /// <param name="index">1-based serial index</param>
+    /// <param name="value">Serial data to be encoded</param>
+    /// <returns>Bytes in XSig format for serial signal information.</returns>
+    public static byte[] GetBytes(int index, string value)
+    {
+        return GetBytes(index, 0, value);
+    }
+
+    /// <summary>
+    /// Get bytes for a single serial signal.
+    /// </summary>
+    /// <param name="index">1-based serial index</param>
+    /// <param name="offset">Index offset.</param>
+    /// <param name="value">Serial data to be encoded</param>
+    /// <returns>Bytes in XSig format for serial signal information.</returns>
+    public static byte[] GetBytes(int index, int offset, string value)
+    {
+        return new XSigSerialToken(index + offset, value).GetBytes();
+    }
+
+    /// <summary>
+    /// Get byte sequence for multiple serial signals.
+    /// </summary>
+    /// <param name="startIndex">Starting index of the sequence.</param>
+    /// <param name="values">Serial signal value array.</param>
+    /// <returns>Byte sequence in XSig format for serial signal information.</returns>
+    public static byte[] GetBytes(int startIndex, string[] values)
+    {
+        return GetBytes(startIndex, 0, values);
+    }
+
+    /// <summary>
+    /// Get byte sequence for multiple serial signals.
+    /// </summary>
+    /// <param name="startIndex">Starting index of the sequence.</param>
+    /// <param name="offset">Index offset.</param>
+    /// <param name="values">Serial signal value array.</param>
+    /// <returns>Byte sequence in XSig format for serial signal information.</returns>
+    public static byte[] GetBytes(int startIndex, int offset, string[] values)
+    {
+        // Serial XSig data is not fixed-length like the other formats
+        var dstOffset = 0;
+        var bytes = new byte[values.Sum(v => v.Length + 3)];
+        for (var i = 0; i < values.Length; i++)
+        {
+            var data = GetBytes(startIndex++, offset, values[i]);
+            Buffer.BlockCopy(data, 0, bytes, dstOffset, data.Length);
+            dstOffset += data.Length;
+        }
+
+        return bytes;
+    }
 }

src/PepperDash.Core/XSigUtility/XSigTokenStreamReader.cs

@@ -4,144 +4,143 @@ using Crestron.SimplSharp.CrestronIO;
 using PepperDash.Core.Intersystem.Serialization;
 using PepperDash.Core.Intersystem.Tokens;
 
-namespace PepperDash.Core.Intersystem
+namespace PepperDash.Core.Intersystem;
+
+/// <summary>
+/// XSigToken stream reader.
+/// </summary>
+public sealed class XSigTokenStreamReader : IDisposable
 {
+    private readonly Stream _stream;
+    private readonly bool _leaveOpen;
+
+    /// <inheritdoc />
     /// <summary>
-    /// XSigToken stream reader.
+    /// XSigToken stream reader constructor.
     /// </summary>
-    public sealed class XSigTokenStreamReader : IDisposable
+    /// <param name="stream">Input stream to read from.</param>
+    /// <exception cref="T:System.ArgumentNullException">Stream is null.</exception>
+    /// <exception cref="T:System.ArgumentException">Stream cannot be read from.</exception>
+    public XSigTokenStreamReader(Stream stream)
+        : this(stream, false) { }
+
+    /// <summary>
+    /// XSigToken stream reader constructor.
+    /// </summary>
+    /// <param name="stream">Input stream to read from.</param>
+    /// <param name="leaveOpen">Determines whether to leave the stream open or not.</param>
+    /// <exception cref="ArgumentNullException">Stream is null.</exception>
+    /// <exception cref="ArgumentException">Stream cannot be read from.</exception>
+    public XSigTokenStreamReader(Stream stream, bool leaveOpen)
     {
-        private readonly Stream _stream;
-        private readonly bool _leaveOpen;
+        if (stream == null)
+            throw new ArgumentNullException("stream");
+        if (!stream.CanRead)
+            throw new ArgumentException("The specified stream cannot be read from.");
 
-        /// <inheritdoc />
-        /// <summary>
-        /// XSigToken stream reader constructor.
-        /// </summary>
-        /// <param name="stream">Input stream to read from.</param>
-        /// <exception cref="T:System.ArgumentNullException">Stream is null.</exception>
-        /// <exception cref="T:System.ArgumentException">Stream cannot be read from.</exception>
-        public XSigTokenStreamReader(Stream stream)
-            : this(stream, false) { }
+        _stream = stream;
+        _leaveOpen = leaveOpen;
+    }
 
-        /// <summary>
-        /// XSigToken stream reader constructor.
-        /// </summary>
-        /// <param name="stream">Input stream to read from.</param>
-        /// <param name="leaveOpen">Determines whether to leave the stream open or not.</param>
-        /// <exception cref="ArgumentNullException">Stream is null.</exception>
-        /// <exception cref="ArgumentException">Stream cannot be read from.</exception>
-        public XSigTokenStreamReader(Stream stream, bool leaveOpen)
+    /// <summary>
+    /// Reads a 16-bit unsigned integer from the specified stream using Big Endian byte order.
+    /// </summary>
+    /// <param name="stream">Input stream</param>
+    /// <param name="value">Result</param>
+    /// <returns>True if successful, otherwise false.</returns>
+    public static bool TryReadUInt16BE(Stream stream, out ushort value)
+    {
+        value = 0;
+        if (stream.Length < 2)
+            return false;
+
+        var buffer = new byte[2];
+        stream.Read(buffer, 0, 2);
+        value = (ushort)((buffer[0] << 8) | buffer[1]);
+        return true;
+    }
+
+    /// <summary>
+    /// Read XSig token from the stream.
+    /// </summary>
+    /// <returns>XSigToken</returns>
+    /// <exception cref="ArgumentOutOfRangeException">Offset is less than 0.</exception>
+    public XSigToken ReadXSigToken()
+    {
+        ushort prefix;
+        if (!TryReadUInt16BE(_stream, out prefix))
+            return null;
+
+        if ((prefix & 0xF880) == 0xC800) // Serial data
         {
-            if (stream == null)
-                throw new ArgumentNullException("stream");
-            if (!stream.CanRead)
-                throw new ArgumentException("The specified stream cannot be read from.");
+            var index = ((prefix & 0x0700) >> 1) | (prefix & 0x7F);
+            var n = 0;
+            const int maxSerialDataLength = 252;
+            var chars = new char[maxSerialDataLength];
+            int ch;
+            while ((ch = _stream.ReadByte()) != 0xFF)
+            {
+                if (ch == -1) // Reached end of stream without end of data marker
+                    return null;
+                
+                chars[n++] = (char)ch;
+            }
 
-            _stream = stream;
-            _leaveOpen = leaveOpen;
+            return new XSigSerialToken((ushort)(index + 1), new string(chars, 0, n));
         }
 
-        /// <summary>
-        /// Reads a 16-bit unsigned integer from the specified stream using Big Endian byte order.
-        /// </summary>
-        /// <param name="stream">Input stream</param>
-        /// <param name="value">Result</param>
-        /// <returns>True if successful, otherwise false.</returns>
-        public static bool TryReadUInt16BE(Stream stream, out ushort value)
+        if ((prefix & 0xC880) == 0xC000) // Analog data
         {
-            value = 0;
-            if (stream.Length < 2)
-                return false;
-
-            var buffer = new byte[2];
-            stream.Read(buffer, 0, 2);
-            value = (ushort)((buffer[0] << 8) | buffer[1]);
-            return true;
-        }
-
-        /// <summary>
-        /// Read XSig token from the stream.
-        /// </summary>
-        /// <returns>XSigToken</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Offset is less than 0.</exception>
-        public XSigToken ReadXSigToken()
-        {
-            ushort prefix;
-            if (!TryReadUInt16BE(_stream, out prefix))
+            ushort data;
+            if (!TryReadUInt16BE(_stream, out data))
                 return null;
 
-            if ((prefix & 0xF880) == 0xC800) // Serial data
-            {
-                var index = ((prefix & 0x0700) >> 1) | (prefix & 0x7F);
-                var n = 0;
-                const int maxSerialDataLength = 252;
-                var chars = new char[maxSerialDataLength];
-                int ch;
-                while ((ch = _stream.ReadByte()) != 0xFF)
-                {
-                    if (ch == -1) // Reached end of stream without end of data marker
-                        return null;
-                    
-                    chars[n++] = (char)ch;
-                }
-
-                return new XSigSerialToken((ushort)(index + 1), new string(chars, 0, n));
-            }
-
-            if ((prefix & 0xC880) == 0xC000) // Analog data
-            {
-                ushort data;
-                if (!TryReadUInt16BE(_stream, out data))
-                    return null;
-
-                var index = ((prefix & 0x0700) >> 1) | (prefix & 0x7F);
-                var value = ((prefix & 0x3000) << 2) | ((data & 0x7F00) >> 1) | (data & 0x7F);
-                return new XSigAnalogToken((ushort)(index + 1), (ushort)value);
-            }
-
-            if ((prefix & 0xC080) == 0x8000) // Digital data
-            {
-                var index = ((prefix & 0x1F00) >> 1) | (prefix & 0x7F);
-                var value = (prefix & 0x2000) == 0;
-                return new XSigDigitalToken((ushort)(index + 1), value);
-            }
-
-            return null;
+            var index = ((prefix & 0x0700) >> 1) | (prefix & 0x7F);
+            var value = ((prefix & 0x3000) << 2) | ((data & 0x7F00) >> 1) | (data & 0x7F);
+            return new XSigAnalogToken((ushort)(index + 1), (ushort)value);
         }
 
-        /// <summary>
-        /// Reads all available XSig tokens from the stream.
-        /// </summary>
-        /// <returns>XSigToken collection.</returns>
-        public IEnumerable<XSigToken> ReadAllXSigTokens()
+        if ((prefix & 0xC080) == 0x8000) // Digital data
         {
-            var tokens = new List<XSigToken>();
-            XSigToken token;
-            while ((token = ReadXSigToken()) != null)
-                tokens.Add(token);
-
-            return tokens;
+            var index = ((prefix & 0x1F00) >> 1) | (prefix & 0x7F);
+            var value = (prefix & 0x2000) == 0;
+            return new XSigDigitalToken((ushort)(index + 1), value);
         }
 
-        /// <summary>
-        /// Attempts to deserialize all XSig data within the stream from the current position.
-        /// </summary>
-        /// <typeparam name="T">Type to deserialize the information to.</typeparam>
-        /// <returns>Deserialized object.</returns>
-        public T DeserializeStream<T>()
-            where T : class, IXSigSerialization, new()
-        {
-            return new T().Deserialize<T>(ReadAllXSigTokens());
-        }
+        return null;
+    }
 
-        /// <summary>
-        /// Disposes of the internal stream if specified to not leave open.
-        /// </summary>
-        public void Dispose()
-        {
-            if (!_leaveOpen)
-                _stream.Dispose();
-        }
+    /// <summary>
+    /// Reads all available XSig tokens from the stream.
+    /// </summary>
+    /// <returns>XSigToken collection.</returns>
+    public IEnumerable<XSigToken> ReadAllXSigTokens()
+    {
+        var tokens = new List<XSigToken>();
+        XSigToken token;
+        while ((token = ReadXSigToken()) != null)
+            tokens.Add(token);
+
+        return tokens;
+    }
+
+    /// <summary>
+    /// Attempts to deserialize all XSig data within the stream from the current position.
+    /// </summary>
+    /// <typeparam name="T">Type to deserialize the information to.</typeparam>
+    /// <returns>Deserialized object.</returns>
+    public T DeserializeStream<T>()
+        where T : class, IXSigSerialization, new()
+    {
+        return new T().Deserialize<T>(ReadAllXSigTokens());
+    }
+
+    /// <summary>
+    /// Disposes of the internal stream if specified to not leave open.
+    /// </summary>
+    public void Dispose()
+    {
+        if (!_leaveOpen)
+            _stream.Dispose();
     }
 }

src/PepperDash.Core/XSigUtility/XSigTokenStreamWriter.cs

@@ -5,132 +5,131 @@ using Crestron.SimplSharp.CrestronIO;
 using PepperDash.Core.Intersystem.Serialization;
 using PepperDash.Core.Intersystem.Tokens;
 
-namespace PepperDash.Core.Intersystem
+namespace PepperDash.Core.Intersystem;
+
+/// <summary>
+/// XSigToken stream writer.
+/// </summary>
+public sealed class XSigTokenStreamWriter : IDisposable
 {
+    private readonly Stream _stream;
+    private readonly bool _leaveOpen;
+
+    /// <inheritdoc />
     /// <summary>
-    /// XSigToken stream writer.
+    /// XSigToken stream writer constructor.
     /// </summary>
-    public sealed class XSigTokenStreamWriter : IDisposable
+    /// <param name="stream">Input stream to write to.</param>
+    /// <exception cref="T:System.ArgumentNullException">Stream is null.</exception>
+    /// <exception cref="T:System.ArgumentException">Stream cannot be written to.</exception>
+    public XSigTokenStreamWriter(Stream stream)
+        : this(stream, false) { }
+
+    /// <summary>
+    /// XSigToken stream writer constructor.
+    /// </summary>
+    /// <param name="stream">Input stream to write to.</param>
+    /// <param name="leaveOpen">Determines whether to leave the stream open or not.</param>
+    /// <exception cref="ArgumentNullException">Stream is null.</exception>
+    /// <exception cref="ArgumentException">Stream cannot be written to.</exception>
+    public XSigTokenStreamWriter(Stream stream, bool leaveOpen)
     {
-        private readonly Stream _stream;
-        private readonly bool _leaveOpen;
+        if (stream == null)
+            throw new ArgumentNullException("stream");
+        if (!stream.CanWrite)
+            throw new ArgumentException("The specified stream cannot be written to.");
 
-        /// <inheritdoc />
-        /// <summary>
-        /// XSigToken stream writer constructor.
-        /// </summary>
-        /// <param name="stream">Input stream to write to.</param>
-        /// <exception cref="T:System.ArgumentNullException">Stream is null.</exception>
-        /// <exception cref="T:System.ArgumentException">Stream cannot be written to.</exception>
-        public XSigTokenStreamWriter(Stream stream)
-            : this(stream, false) { }
+        _stream = stream;
+        _leaveOpen = leaveOpen;
+    }
 
-        /// <summary>
-        /// XSigToken stream writer constructor.
-        /// </summary>
-        /// <param name="stream">Input stream to write to.</param>
-        /// <param name="leaveOpen">Determines whether to leave the stream open or not.</param>
-        /// <exception cref="ArgumentNullException">Stream is null.</exception>
-        /// <exception cref="ArgumentException">Stream cannot be written to.</exception>
-        public XSigTokenStreamWriter(Stream stream, bool leaveOpen)
+    /// <summary>
+    /// Write XSig data gathered from an IXSigStateResolver to the stream.
+    /// </summary>
+    /// <param name="xSigSerialization">IXSigStateResolver object.</param>
+    public void WriteXSigData(IXSigSerialization xSigSerialization)
+    {
+        WriteXSigData(xSigSerialization, 0);
+    }
+
+    /// <summary>
+    /// Write XSig data gathered from an IXSigStateResolver to the stream.
+    /// </summary>
+    /// <param name="xSigSerialization">IXSigStateResolver object.</param>
+    /// <param name="offset">Index offset for each XSigToken.</param>
+    public void WriteXSigData(IXSigSerialization xSigSerialization, int offset)
+    {
+        if (xSigSerialization == null)
+            throw new ArgumentNullException("xSigSerialization");
+
+        var tokens = xSigSerialization.Serialize();
+        WriteXSigData(tokens, offset);
+    }
+
+    /// <summary>
+    /// Write XSigToken to the stream.
+    /// </summary>
+    /// <param name="token">XSigToken object.</param>
+    public void WriteXSigData(XSigToken token)
+    {
+        WriteXSigData(token, 0);
+    }
+
+    /// <summary>
+    /// Write XSigToken to the stream.
+    /// </summary>
+    /// <param name="token">XSigToken object.</param>
+    /// <param name="offset">Index offset for each XSigToken.</param>
+    public void WriteXSigData(XSigToken token, int offset)
+    {
+        WriteXSigData(new[] { token }, offset);
+    }
+
+    /// <summary>
+    /// Writes an array of XSigTokens to the stream.
+    /// </summary>
+    /// <param name="tokens">XSigToken objects.</param>
+    public void WriteXSigData(XSigToken[] tokens)
+    {
+        WriteXSigData(tokens.AsEnumerable());
+    }
+
+    /// <summary>
+    /// Write an enumerable collection of XSigTokens to the stream.
+    /// </summary>
+    /// <param name="tokens">XSigToken objects.</param>
+    public void WriteXSigData(IEnumerable<XSigToken> tokens)
+    {
+        WriteXSigData(tokens, 0);
+    }
+
+    /// <summary>
+    /// Write an enumerable collection of XSigTokens to the stream.
+    /// </summary>
+    /// <param name="tokens">XSigToken objects.</param>
+    /// <param name="offset">Index offset for each XSigToken.</param>
+    public void WriteXSigData(IEnumerable<XSigToken> tokens, int offset)
+    {
+        if (offset < 0)
+            throw new ArgumentOutOfRangeException("offset", "Offset must be greater than or equal to 0.");
+
+        if (tokens != null)
         {
-            if (stream == null)
-                throw new ArgumentNullException("stream");
-            if (!stream.CanWrite)
-                throw new ArgumentException("The specified stream cannot be written to.");
-
-            _stream = stream;
-            _leaveOpen = leaveOpen;
-        }
-
-        /// <summary>
-        /// Write XSig data gathered from an IXSigStateResolver to the stream.
-        /// </summary>
-        /// <param name="xSigSerialization">IXSigStateResolver object.</param>
-        public void WriteXSigData(IXSigSerialization xSigSerialization)
-        {
-            WriteXSigData(xSigSerialization, 0);
-        }
-
-        /// <summary>
-        /// Write XSig data gathered from an IXSigStateResolver to the stream.
-        /// </summary>
-        /// <param name="xSigSerialization">IXSigStateResolver object.</param>
-        /// <param name="offset">Index offset for each XSigToken.</param>
-        public void WriteXSigData(IXSigSerialization xSigSerialization, int offset)
-        {
-            if (xSigSerialization == null)
-                throw new ArgumentNullException("xSigSerialization");
-
-            var tokens = xSigSerialization.Serialize();
-            WriteXSigData(tokens, offset);
-        }
-
-        /// <summary>
-        /// Write XSigToken to the stream.
-        /// </summary>
-        /// <param name="token">XSigToken object.</param>
-        public void WriteXSigData(XSigToken token)
-        {
-            WriteXSigData(token, 0);
-        }
-
-        /// <summary>
-        /// Write XSigToken to the stream.
-        /// </summary>
-        /// <param name="token">XSigToken object.</param>
-        /// <param name="offset">Index offset for each XSigToken.</param>
-        public void WriteXSigData(XSigToken token, int offset)
-        {
-            WriteXSigData(new[] { token }, offset);
-        }
-
-        /// <summary>
-        /// Writes an array of XSigTokens to the stream.
-        /// </summary>
-        /// <param name="tokens">XSigToken objects.</param>
-        public void WriteXSigData(XSigToken[] tokens)
-        {
-            WriteXSigData(tokens.AsEnumerable());
-        }
-
-        /// <summary>
-        /// Write an enumerable collection of XSigTokens to the stream.
-        /// </summary>
-        /// <param name="tokens">XSigToken objects.</param>
-        public void WriteXSigData(IEnumerable<XSigToken> tokens)
-        {
-            WriteXSigData(tokens, 0);
-        }
-
-        /// <summary>
-        /// Write an enumerable collection of XSigTokens to the stream.
-        /// </summary>
-        /// <param name="tokens">XSigToken objects.</param>
-        /// <param name="offset">Index offset for each XSigToken.</param>
-        public void WriteXSigData(IEnumerable<XSigToken> tokens, int offset)
-        {
-            if (offset < 0)
-                throw new ArgumentOutOfRangeException("offset", "Offset must be greater than or equal to 0.");
-
-            if (tokens != null)
+            foreach (var token in tokens)
             {
-                foreach (var token in tokens)
-                {
-                    if (token == null) continue;
-                    var bytes = token.GetTokenWithOffset(offset).GetBytes();
-                    _stream.Write(bytes, 0, bytes.Length);
-                }
+                if (token == null) continue;
+                var bytes = token.GetTokenWithOffset(offset).GetBytes();
+                _stream.Write(bytes, 0, bytes.Length);
             }
         }
+    }
 
-        /// <summary>
-        /// Disposes of the internal stream if specified to not leave open.
-        /// </summary>
-        public void Dispose()
-        {
-            if (!_leaveOpen)
-                _stream.Dispose();
-        }
+    /// <summary>
+    /// Disposes of the internal stream if specified to not leave open.
+    /// </summary>
+    public void Dispose()
+    {
+        if (!_leaveOpen)
+            _stream.Dispose();
     }
 }

src/PepperDash.Essentials.Core/Abstractions/CrestronControlSystemAdapter.cs

@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Crestron.SimplSharpPro;
+
+namespace PepperDash.Essentials.Core.Abstractions
+{
+    /// <summary>
+    /// Adapter that wraps actual Crestron Control System for production use
+    /// </summary>
+    public class CrestronControlSystemAdapter : ICrestronControlSystem
+    {
+        private readonly CrestronControlSystem _controlSystem;
+        private readonly Dictionary<uint, IRelayPort> _relayPorts;
+
+        public CrestronControlSystemAdapter(CrestronControlSystem controlSystem)
+        {
+            _controlSystem = controlSystem ?? throw new ArgumentNullException(nameof(controlSystem));
+            _relayPorts = new Dictionary<uint, IRelayPort>();
+            
+            if (_controlSystem.SupportsRelay)
+            {
+                for (uint i = 1; i <= (uint)_controlSystem.NumberOfRelayPorts; i++)
+                {
+                    _relayPorts[i] = new RelayPortAdapter(_controlSystem.RelayPorts[i]);
+                }
+            }
+        }
+
+        public bool SupportsRelay => _controlSystem.SupportsRelay;
+        public uint NumberOfRelayPorts => (uint)_controlSystem.NumberOfRelayPorts;
+        public Dictionary<uint, IRelayPort> RelayPorts => _relayPorts;
+        public string ProgramIdTag => "TestProgram"; // Simplified for now
+        public string ControllerPrompt => _controlSystem.ControllerPrompt;
+        public bool SupportsEthernet => _controlSystem.SupportsEthernet;
+        public bool SupportsDigitalInput => _controlSystem.SupportsDigitalInput;
+        public uint NumberOfDigitalInputPorts => (uint)_controlSystem.NumberOfDigitalInputPorts;
+        public bool SupportsVersiPort => _controlSystem.SupportsVersiport;
+        public uint NumberOfVersiPorts => (uint)_controlSystem.NumberOfVersiPorts;
+    }
+
+    /// <summary>
+    /// Adapter for Crestron relay port
+    /// </summary>
+    public class RelayPortAdapter : IRelayPort
+    {
+        private readonly Crestron.SimplSharpPro.Relay _relay;
+
+        public RelayPortAdapter(Crestron.SimplSharpPro.Relay relay)
+        {
+            _relay = relay ?? throw new ArgumentNullException(nameof(relay));
+        }
+
+        public void Open() => _relay.Open();
+        public void Close() => _relay.Close();
+        public void Pulse(int delayMs) 
+        {
+            // Crestron Relay.Pulse() doesn't take parameters
+            // We'll just call the basic Pulse method
+            _relay.Close();
+            System.Threading.Thread.Sleep(delayMs);
+            _relay.Open();
+        }
+        public bool State => _relay.State;
+    }
+
+    /// <summary>
+    /// Adapter for Crestron digital input
+    /// </summary>
+    public class DigitalInputAdapter : IDigitalInput
+    {
+        private readonly Crestron.SimplSharpPro.DigitalInput _digitalInput;
+
+        public DigitalInputAdapter(Crestron.SimplSharpPro.DigitalInput digitalInput)
+        {
+            _digitalInput = digitalInput ?? throw new ArgumentNullException(nameof(digitalInput));
+            _digitalInput.StateChange += OnStateChange;
+        }
+
+        public bool State => _digitalInput.State;
+        public event EventHandler<DigitalInputEventArgs> StateChange;
+
+        private void OnStateChange(DigitalInput digitalInput, Crestron.SimplSharpPro.DigitalInputEventArgs args)
+        {
+            StateChange?.Invoke(this, new Abstractions.DigitalInputEventArgs(args.State));
+        }
+    }
+
+    /// <summary>
+    /// Adapter for Crestron VersiPort
+    /// </summary>
+    public class VersiPortAdapter : IVersiPort
+    {
+        private readonly Crestron.SimplSharpPro.Versiport _versiPort;
+
+        public VersiPortAdapter(Crestron.SimplSharpPro.Versiport versiPort)
+        {
+            _versiPort = versiPort ?? throw new ArgumentNullException(nameof(versiPort));
+            _versiPort.VersiportChange += OnVersiportChange;
+        }
+
+        public bool DigitalIn => _versiPort.DigitalIn;
+        public void SetDigitalOut(bool value) => _versiPort.DigitalOut = value;
+        public ushort AnalogIn => _versiPort.AnalogIn;
+        public event EventHandler<VersiPortEventArgs> VersiportChange;
+
+        private void OnVersiportChange(Versiport port, VersiportEventArgs args)
+        {
+            var eventType = args.Event == eVersiportEvent.DigitalInChange 
+                ? VersiPortEventType.DigitalInChange 
+                : VersiPortEventType.AnalogInChange;
+            
+            VersiportChange?.Invoke(this, new Abstractions.VersiPortEventArgs 
+            { 
+                EventType = eventType,
+                Value = args.Event == eVersiportEvent.DigitalInChange ? (object)port.DigitalIn : port.AnalogIn
+            });
+        }
+    }
+}

src/PepperDash.Essentials.Core/Abstractions/ICrestronControlSystem.cs

@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+
+namespace PepperDash.Essentials.Core.Abstractions
+{
+    /// <summary>
+    /// Abstraction for Crestron Control System to enable unit testing
+    /// </summary>
+    public interface ICrestronControlSystem
+    {
+        bool SupportsRelay { get; }
+        uint NumberOfRelayPorts { get; }
+        Dictionary<uint, IRelayPort> RelayPorts { get; }
+        string ProgramIdTag { get; }
+        string ControllerPrompt { get; }
+        bool SupportsEthernet { get; }
+        bool SupportsDigitalInput { get; }
+        uint NumberOfDigitalInputPorts { get; }
+        bool SupportsVersiPort { get; }
+        uint NumberOfVersiPorts { get; }
+    }
+
+    /// <summary>
+    /// Abstraction for relay port
+    /// </summary>
+    public interface IRelayPort
+    {
+        void Open();
+        void Close();
+        void Pulse(int delayMs);
+        bool State { get; }
+    }
+
+    /// <summary>
+    /// Abstraction for digital input
+    /// </summary>
+    public interface IDigitalInput
+    {
+        bool State { get; }
+        event EventHandler<DigitalInputEventArgs> StateChange;
+    }
+
+    public class DigitalInputEventArgs : EventArgs
+    {
+        public bool State { get; set; }
+        public DigitalInputEventArgs(bool state)
+        {
+            State = state;
+        }
+    }
+
+    /// <summary>
+    /// Abstraction for VersiPort
+    /// </summary>
+    public interface IVersiPort
+    {
+        bool DigitalIn { get; }
+        void SetDigitalOut(bool value);
+        ushort AnalogIn { get; }
+        event EventHandler<VersiPortEventArgs> VersiportChange;
+    }
+
+    public class VersiPortEventArgs : EventArgs
+    {
+        public VersiPortEventType EventType { get; set; }
+        public object Value { get; set; }
+    }
+
+    public enum VersiPortEventType
+    {
+        DigitalInChange,
+        AnalogInChange
+    }
+}

src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs

@@ -16,410 +16,408 @@ using Serilog.Events;
 
 //using PepperDash.Essentials.Devices.Common.Cameras;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+/// <summary>
+/// Base class for bridge API variants
+/// </summary>
+public abstract class BridgeApi : EssentialsDevice
 {
-    /// <summary>
-    /// Base class for bridge API variants
-    /// </summary>
-    public abstract class BridgeApi : EssentialsDevice
+    protected BridgeApi(string key) :
+        base(key)
     {
-        protected BridgeApi(string key) :
-            base(key)
-        {
 
+    }
+}
+
+/// <summary>
+/// Bridge API using EISC
+/// </summary>
+public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
+{
+    public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
+
+    public Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
+
+    public BasicTriList Eisc { get; private set; }
+
+    public EiscApiAdvanced(DeviceConfig dc, BasicTriList eisc) :
+        base(dc.Key)
+    {
+        JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
+
+        PropertiesConfig = dc.Properties.ToObject<EiscApiPropertiesConfig>();
+        //PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
+
+        Eisc = eisc;
+
+        Eisc.SigChange += Eisc_SigChange;
+
+        CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, Eisc, 120000, 300000);
+
+        AddPostActivationAction(LinkDevices);
+        AddPostActivationAction(LinkRooms);
+        AddPostActivationAction(RegisterEisc);
+    }
+
+    public override bool CustomActivate()
+    {
+        CommunicationMonitor.Start();
+        return base.CustomActivate();
+    }
+
+    public override bool Deactivate()
+    {
+        CommunicationMonitor.Stop();
+        return base.Deactivate();
+    }
+
+    private void LinkDevices()
+    {
+        Debug.LogMessage(LogEventLevel.Debug, this, "Linking Devices...");
+
+        if (PropertiesConfig.Devices == null)
+        {
+            Debug.LogMessage(LogEventLevel.Debug, this, "No devices linked to this bridge");
+            return;
+        }
+
+        foreach (var d in PropertiesConfig.Devices)
+        {
+            var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
+
+            if (device == null)
+            {
+                continue;
+            }
+
+            Debug.LogMessage(LogEventLevel.Debug, this, "Linking Device: '{0}'", device.Key);
+
+            if (device is IBridgeAdvanced bridge)
+            {
+                bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
+                continue;
+            }
+
+            Debug.LogMessage(LogEventLevel.Information, this,
+                    "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
+                    device.Key);
+        }
+    }
+
+    private void RegisterEisc()
+    {
+        if (Eisc.Registered)
+        {
+            return;
+        }
+
+        var registerResult = Eisc.Register();
+
+        if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
+        {
+            Debug.LogMessage(LogEventLevel.Verbose, this, "Registration result: {0}", registerResult);
+            return;
+        }
+
+        Debug.LogMessage(LogEventLevel.Debug, this, "EISC registration successful");
+    }
+
+    public void LinkRooms()
+    {
+        Debug.LogMessage(LogEventLevel.Debug, this, "Linking Rooms...");
+
+        if (PropertiesConfig.Rooms == null)
+        {
+            Debug.LogMessage(LogEventLevel.Debug, this, "No rooms linked to this bridge.");
+            return;
+        }
+
+        foreach (var room in PropertiesConfig.Rooms)
+        {
+            var rm = DeviceManager.GetDeviceForKey(room.RoomKey) as IBridgeAdvanced;
+
+            if (rm == null)
+            {
+                Debug.LogMessage(LogEventLevel.Debug, this,
+                    "Room {0} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
+                continue;
+            }
+
+            rm.LinkToApi(Eisc, room.JoinStart, room.JoinMapKey, this);
         }
     }
 
     /// <summary>
-    /// Bridge API using EISC
+    /// Adds a join map
     /// </summary>
-    public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
+    /// <param name="deviceKey"></param>
+    /// <param name="joinMap"></param>
+    public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
     {
-        public EiscApiPropertiesConfig PropertiesConfig { get; private set; }
-
-        public Dictionary<string, JoinMapBaseAdvanced> JoinMaps { get; private set; }
-
-        public BasicTriList Eisc { get; private set; }
-
-        public EiscApiAdvanced(DeviceConfig dc, BasicTriList eisc) :
-            base(dc.Key)
+        if (!JoinMaps.ContainsKey(deviceKey))
         {
-            JoinMaps = new Dictionary<string, JoinMapBaseAdvanced>();
-
-            PropertiesConfig = dc.Properties.ToObject<EiscApiPropertiesConfig>();
-            //PropertiesConfig = JsonConvert.DeserializeObject<EiscApiPropertiesConfig>(dc.Properties.ToString());
-
-            Eisc = eisc;
-
-            Eisc.SigChange += Eisc_SigChange;
-
-            CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, Eisc, 120000, 300000);
-
-            AddPostActivationAction(LinkDevices);
-            AddPostActivationAction(LinkRooms);
-            AddPostActivationAction(RegisterEisc);
+            JoinMaps.Add(deviceKey, joinMap);
         }
-
-        public override bool CustomActivate()
+        else
         {
-            CommunicationMonitor.Start();
-            return base.CustomActivate();
+            Debug.LogMessage(LogEventLevel.Verbose, this, "Unable to add join map with key '{0}'.  Key already exists in JoinMaps dictionary", deviceKey);
         }
-
-        public override bool Deactivate()
-        {
-            CommunicationMonitor.Stop();
-            return base.Deactivate();
-        }
-
-        private void LinkDevices()
-        {
-            Debug.LogMessage(LogEventLevel.Debug, this, "Linking Devices...");
-
-            if (PropertiesConfig.Devices == null)
-            {
-                Debug.LogMessage(LogEventLevel.Debug, this, "No devices linked to this bridge");
-                return;
-            }
-
-            foreach (var d in PropertiesConfig.Devices)
-            {
-                var device = DeviceManager.GetDeviceForKey(d.DeviceKey);
-
-                if (device == null)
-                {
-                    continue;
-                }
-
-                Debug.LogMessage(LogEventLevel.Debug, this, "Linking Device: '{0}'", device.Key);
-
-                if (device is IBridgeAdvanced bridge)
-                {
-                    bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
-                    continue;
-                }
-
-                Debug.LogMessage(LogEventLevel.Information, this,
-                        "{0} is not compatible with this bridge type. Please use 'eiscapi' instead, or updae the device.",
-                        device.Key);
-            }
-        }
-
-        private void RegisterEisc()
-        {
-            if (Eisc.Registered)
-            {
-                return;
-            }
-
-            var registerResult = Eisc.Register();
-
-            if (registerResult != eDeviceRegistrationUnRegistrationResponse.Success)
-            {
-                Debug.LogMessage(LogEventLevel.Verbose, this, "Registration result: {0}", registerResult);
-                return;
-            }
-
-            Debug.LogMessage(LogEventLevel.Debug, this, "EISC registration successful");
-        }
-
-        public void LinkRooms()
-        {
-            Debug.LogMessage(LogEventLevel.Debug, this, "Linking Rooms...");
-
-            if (PropertiesConfig.Rooms == null)
-            {
-                Debug.LogMessage(LogEventLevel.Debug, this, "No rooms linked to this bridge.");
-                return;
-            }
-
-            foreach (var room in PropertiesConfig.Rooms)
-            {
-                var rm = DeviceManager.GetDeviceForKey(room.RoomKey) as IBridgeAdvanced;
-
-                if (rm == null)
-                {
-                    Debug.LogMessage(LogEventLevel.Debug, this,
-                        "Room {0} does not implement IBridgeAdvanced. Skipping...", room.RoomKey);
-                    continue;
-                }
-
-                rm.LinkToApi(Eisc, room.JoinStart, room.JoinMapKey, this);
-            }
-        }
-
-        /// <summary>
-        /// Adds a join map
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        /// <param name="joinMap"></param>
-        public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
-        {
-            if (!JoinMaps.ContainsKey(deviceKey))
-            {
-                JoinMaps.Add(deviceKey, joinMap);
-            }
-            else
-            {
-                Debug.LogMessage(LogEventLevel.Verbose, this, "Unable to add join map with key '{0}'.  Key already exists in JoinMaps dictionary", deviceKey);
-            }
-        }
-
-        /// <summary>
-        /// Prints all the join maps on this bridge
-        /// </summary>
-        public virtual void PrintJoinMaps()
-        {
-            CrestronConsole.ConsoleCommandResponse("Join Maps for EISC IPID: {0}\r\n", Eisc.ID.ToString("X"));
-
-            foreach (var joinMap in JoinMaps)
-            {
-                CrestronConsole.ConsoleCommandResponse("Join map for device '{0}':", joinMap.Key);
-                joinMap.Value.PrintJoinMapInfo();
-            }
-        }
-        /// <summary>
-        /// Generates markdown for all join maps on this bridge
-        /// </summary>
-        public virtual void MarkdownForBridge(string bridgeKey)
-        {
-            Debug.LogMessage(LogEventLevel.Information, this, "Writing Joinmaps to files for EISC IPID: {0}", Eisc.ID.ToString("X"));
-
-            foreach (var joinMap in JoinMaps)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Generating markdown for device '{0}':", joinMap.Key);
-                joinMap.Value.MarkdownJoinMapInfo(joinMap.Key, bridgeKey);
-            }
-        }
-
-        /// <summary>
-        /// Prints the join map for a device by key
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        public void PrintJoinMapForDevice(string deviceKey)
-        {
-            var joinMap = JoinMaps[deviceKey];
-
-            if (joinMap == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
-                return;
-            }
-
-            Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
-            joinMap.PrintJoinMapInfo();
-        }
-        /// <summary>
-        /// Prints the join map for a device by key
-        /// </summary>
-        /// <param name="deviceKey"></param>
-        public void MarkdownJoinMapForDevice(string deviceKey, string bridgeKey)
-        {
-            var joinMap = JoinMaps[deviceKey];
-
-            if (joinMap == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
-                return;
-            }
-
-            Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
-            joinMap.MarkdownJoinMapInfo(deviceKey, bridgeKey);
-        }
-
-        /// <summary>
-        /// Used for debugging to trigger an action based on a join number and type
-        /// </summary>
-        /// <param name="join"></param>
-        /// <param name="type"></param>
-        /// <param name="state"></param>
-        public void ExecuteJoinAction(uint join, string type, object state)
-        {
-            try
-            {
-                switch (type.ToLower())
-                {
-                    case "digital":
-                        {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
-                            if (uo != null)
-                            {
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToBoolean(state));
-                            }
-                            else
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
-                            break;
-                        }
-                    case "analog":
-                        {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
-                            if (uo != null)
-                            {
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToUInt16(state));
-                            }
-                            else
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute"); break;
-                        }
-                    case "serial":
-                        {
-                            var uo = Eisc.BooleanOutput[join].UserObject as Action<string>;
-                            if (uo != null)
-                            {
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
-                                uo(Convert.ToString(state));
-                            }
-                            else
-                                Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
-                            break;
-                        }
-                    default:
-                        {
-                            Debug.LogMessage(LogEventLevel.Verbose, "Unknown join type.  Use digital/serial/analog");
-                            break;
-                        }
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
-            }
-
-        }
-
-        /// <summary>
-        /// Handles incoming sig changes
-        /// </summary>
-        /// <param name="currentDevice"></param>
-        /// <param name="args"></param>
-        protected void Eisc_SigChange(object currentDevice, SigEventArgs args)
-        {
-            try
-            {
-                Debug.LogMessage(LogEventLevel.Verbose, this, "EiscApiAdvanced change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
-                var uo = args.Sig.UserObject;
-
-                if (uo == null) return;
-
-                Debug.LogMessage(LogEventLevel.Debug, this, "Executing Action: {0}", uo.ToString());
-                if (uo is Action<bool>)
-                    (uo as Action<bool>)(args.Sig.BoolValue);
-                else if (uo is Action<ushort>)
-                    (uo as Action<ushort>)(args.Sig.UShortValue);
-                else if (uo is Action<string>)
-                    (uo as Action<string>)(args.Sig.StringValue);
-            }
-            catch (Exception e)
-            {
-                Debug.LogMessage(LogEventLevel.Verbose, this, "Error in Eisc_SigChange handler: {0}", e);
-            }
-        }
-
-        #region Implementation of ICommunicationMonitor
-
-        public StatusMonitorBase CommunicationMonitor { get; private set; }
-
-        #endregion
     }
 
-    public class EiscApiPropertiesConfig
+    /// <summary>
+    /// Prints all the join maps on this bridge
+    /// </summary>
+    public virtual void PrintJoinMaps()
     {
-        [JsonProperty("control")]
-        public EssentialsControlPropertiesConfig Control { get; set; }
+        CrestronConsole.ConsoleCommandResponse("Join Maps for EISC IPID: {0}\r\n", Eisc.ID.ToString("X"));
 
-        [JsonProperty("devices")]
-        public List<ApiDevicePropertiesConfig> Devices { get; set; }
-
-        [JsonProperty("rooms")]
-        public List<ApiRoomPropertiesConfig> Rooms { get; set; }
-
-
-        public class ApiDevicePropertiesConfig
+        foreach (var joinMap in JoinMaps)
         {
-            [JsonProperty("deviceKey")]
-            public string DeviceKey { get; set; }
-
-            [JsonProperty("joinStart")]
-            public uint JoinStart { get; set; }
-
-            [JsonProperty("joinMapKey")]
-            public string JoinMapKey { get; set; }
+            CrestronConsole.ConsoleCommandResponse("Join map for device '{0}':", joinMap.Key);
+            joinMap.Value.PrintJoinMapInfo();
         }
+    }
+    /// <summary>
+    /// Generates markdown for all join maps on this bridge
+    /// </summary>
+    public virtual void MarkdownForBridge(string bridgeKey)
+    {
+        Debug.LogMessage(LogEventLevel.Information, this, "Writing Joinmaps to files for EISC IPID: {0}", Eisc.ID.ToString("X"));
 
-        public class ApiRoomPropertiesConfig
+        foreach (var joinMap in JoinMaps)
         {
-            [JsonProperty("roomKey")]
-            public string RoomKey { get; set; }
-
-            [JsonProperty("joinStart")]
-            public uint JoinStart { get; set; }
-
-            [JsonProperty("joinMapKey")]
-            public string JoinMapKey { get; set; }
+            Debug.LogMessage(LogEventLevel.Information, "Generating markdown for device '{0}':", joinMap.Key);
+            joinMap.Value.MarkdownJoinMapInfo(joinMap.Key, bridgeKey);
         }
-
     }
 
-    public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
+    /// <summary>
+    /// Prints the join map for a device by key
+    /// </summary>
+    /// <param name="deviceKey"></param>
+    public void PrintJoinMapForDevice(string deviceKey)
     {
-        public EiscApiAdvancedFactory()
+        var joinMap = JoinMaps[deviceKey];
+
+        if (joinMap == null)
         {
-            TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
+            Debug.LogMessage(LogEventLevel.Information, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
+            return;
         }
 
-        public override EssentialsDevice BuildDevice(DeviceConfig dc)
+        Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
+        joinMap.PrintJoinMapInfo();
+    }
+    /// <summary>
+    /// Prints the join map for a device by key
+    /// </summary>
+    /// <param name="deviceKey"></param>
+    public void MarkdownJoinMapForDevice(string deviceKey, string bridgeKey)
+    {
+        var joinMap = JoinMaps[deviceKey];
+
+        if (joinMap == null)
         {
-            Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new EiscApiAdvanced Device");
+            Debug.LogMessage(LogEventLevel.Information, this, "Unable to find joinMap for device with key: '{0}'", deviceKey);
+            return;
+        }
 
-            var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
+        Debug.LogMessage(LogEventLevel.Information, "Join map for device '{0}' on EISC '{1}':", deviceKey, Key);
+        joinMap.MarkdownJoinMapInfo(deviceKey, bridgeKey);
+    }
 
-            BasicTriList eisc;
-
-            switch (dc.Type.ToLower())
+    /// <summary>
+    /// Used for debugging to trigger an action based on a join number and type
+    /// </summary>
+    /// <param name="join"></param>
+    /// <param name="type"></param>
+    /// <param name="state"></param>
+    public void ExecuteJoinAction(uint join, string type, object state)
+    {
+        try
+        {
+            switch (type.ToLower())
             {
-                case "eiscapiadv":
-                case "eiscapiadvanced":
+                case "digital":
                     {
-                        eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
-                            controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                        break;
-                    }
-                case "eiscapiadvancedserver":
-                    {
-                        eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
-                        break;
-                    }
-                case "eiscapiadvancedclient":
-                    {
-                        eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
-                        break;
-                    }
-                case "vceiscapiadv":
-                case "vceiscapiadvanced":
-                    {
-                        if (string.IsNullOrEmpty(controlProperties.RoomId))
+                        var uo = Eisc.BooleanOutput[join].UserObject as Action<bool>;
+                        if (uo != null)
                         {
-                            Debug.LogMessage(LogEventLevel.Information, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
-                            eisc = null;
-                            break;
+                            Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
+                            uo(Convert.ToBoolean(state));
                         }
-                        eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
-                            Global.ControlSystem);
+                        else
+                            Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
+                        break;
+                    }
+                case "analog":
+                    {
+                        var uo = Eisc.BooleanOutput[join].UserObject as Action<ushort>;
+                        if (uo != null)
+                        {
+                            Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
+                            uo(Convert.ToUInt16(state));
+                        }
+                        else
+                            Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute"); break;
+                    }
+                case "serial":
+                    {
+                        var uo = Eisc.BooleanOutput[join].UserObject as Action<string>;
+                        if (uo != null)
+                        {
+                            Debug.LogMessage(LogEventLevel.Verbose, this, "Executing Action: {0}", uo.ToString());
+                            uo(Convert.ToString(state));
+                        }
+                        else
+                            Debug.LogMessage(LogEventLevel.Verbose, this, "User Action is null.  Nothing to Execute");
                         break;
                     }
                 default:
-                    eisc = null;
-                    break;
+                    {
+                        Debug.LogMessage(LogEventLevel.Verbose, "Unknown join type.  Use digital/serial/analog");
+                        break;
+                    }
             }
+        }
+        catch (Exception e)
+        {
+            Debug.LogMessage(LogEventLevel.Debug, this, "Error: {0}", e);
+        }
 
-            if (eisc == null)
-            {
-                return null;
-            }
+    }
 
-            return new EiscApiAdvanced(dc, eisc);
+    /// <summary>
+    /// Handles incoming sig changes
+    /// </summary>
+    /// <param name="currentDevice"></param>
+    /// <param name="args"></param>
+    protected void Eisc_SigChange(object currentDevice, SigEventArgs args)
+    {
+        try
+        {
+            Debug.LogMessage(LogEventLevel.Verbose, this, "EiscApiAdvanced change: {0} {1}={2}", args.Sig.Type, args.Sig.Number, args.Sig.StringValue);
+            var uo = args.Sig.UserObject;
+
+            if (uo == null) return;
+
+            Debug.LogMessage(LogEventLevel.Debug, this, "Executing Action: {0}", uo.ToString());
+            if (uo is Action<bool>)
+                (uo as Action<bool>)(args.Sig.BoolValue);
+            else if (uo is Action<ushort>)
+                (uo as Action<ushort>)(args.Sig.UShortValue);
+            else if (uo is Action<string>)
+                (uo as Action<string>)(args.Sig.StringValue);
+        }
+        catch (Exception e)
+        {
+            Debug.LogMessage(LogEventLevel.Verbose, this, "Error in Eisc_SigChange handler: {0}", e);
         }
     }
 
+    #region Implementation of ICommunicationMonitor
+
+    public StatusMonitorBase CommunicationMonitor { get; private set; }
+
+    #endregion
+}
+
+public class EiscApiPropertiesConfig
+{
+    [JsonProperty("control")]
+    public EssentialsControlPropertiesConfig Control { get; set; }
+
+    [JsonProperty("devices")]
+    public List<ApiDevicePropertiesConfig> Devices { get; set; }
+
+    [JsonProperty("rooms")]
+    public List<ApiRoomPropertiesConfig> Rooms { get; set; }
+
+
+    public class ApiDevicePropertiesConfig
+    {
+        [JsonProperty("deviceKey")]
+        public string DeviceKey { get; set; }
+
+        [JsonProperty("joinStart")]
+        public uint JoinStart { get; set; }
+
+        [JsonProperty("joinMapKey")]
+        public string JoinMapKey { get; set; }
+    }
+
+    public class ApiRoomPropertiesConfig
+    {
+        [JsonProperty("roomKey")]
+        public string RoomKey { get; set; }
+
+        [JsonProperty("joinStart")]
+        public uint JoinStart { get; set; }
+
+        [JsonProperty("joinMapKey")]
+        public string JoinMapKey { get; set; }
+    }
+
+}
+
+public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
+{
+    public EiscApiAdvancedFactory()
+    {
+        TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
+    }
+
+    public override EssentialsDevice BuildDevice(DeviceConfig dc)
+    {
+        Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new EiscApiAdvanced Device");
+
+        var controlProperties = CommFactory.GetControlPropertiesConfig(dc);
+
+        BasicTriList eisc;
+
+        switch (dc.Type.ToLower())
+        {
+            case "eiscapiadv":
+            case "eiscapiadvanced":
+                {
+                    eisc = new ThreeSeriesTcpIpEthernetIntersystemCommunications(controlProperties.IpIdInt,
+                        controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    break;
+                }
+            case "eiscapiadvancedserver":
+                {
+                    eisc = new EISCServer(controlProperties.IpIdInt, Global.ControlSystem);
+                    break;
+                }
+            case "eiscapiadvancedclient":
+                {
+                    eisc = new EISCClient(controlProperties.IpIdInt, controlProperties.TcpSshProperties.Address, Global.ControlSystem);
+                    break;
+                }
+            case "vceiscapiadv":
+            case "vceiscapiadvanced":
+                {
+                    if (string.IsNullOrEmpty(controlProperties.RoomId))
+                    {
+                        Debug.LogMessage(LogEventLevel.Information, "Unable to build VC-4 EISC Client for device {0}. Room ID is missing or empty", dc.Key);
+                        eisc = null;
+                        break;
+                    }
+                    eisc = new VirtualControlEISCClient(controlProperties.IpIdInt, controlProperties.RoomId,
+                        Global.ControlSystem);
+                    break;
+                }
+            default:
+                eisc = null;
+                break;
+        }
+
+        if (eisc == null)
+        {
+            return null;
+        }
+
+        return new EiscApiAdvanced(dc, eisc);
+    }
 }

src/PepperDash.Essentials.Core/Bridges/BridgeHelper.cs

@@ -3,64 +3,62 @@ using Serilog.Events;
 
 //using PepperDash.Essentials.Devices.Common.Cameras;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+/// <summary>
+/// Helper methods for bridges
+/// </summary>
+public static class BridgeHelper
 {
-    /// <summary>
-    /// Helper methods for bridges
-    /// </summary>
-    public static class BridgeHelper
+    public static void PrintJoinMap(string command)
     {
-        public static void PrintJoinMap(string command)
+        var targets = command.Split(' ');
+
+        var bridgeKey = targets[0].Trim();
+
+        if (!(DeviceManager.GetDeviceForKey(bridgeKey) is EiscApiAdvanced bridge))
         {
-            var targets = command.Split(' ');
-
-            var bridgeKey = targets[0].Trim();
-
-            if (!(DeviceManager.GetDeviceForKey(bridgeKey) is EiscApiAdvanced bridge))
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
-                return;
-            }
-
-            if (targets.Length > 1)
-            {
-                var deviceKey = targets[1].Trim();
-
-                if (string.IsNullOrEmpty(deviceKey)) return;
-                bridge.PrintJoinMapForDevice(deviceKey);
-            }
-            else
-            {
-                bridge.PrintJoinMaps();
-            }
+            Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
+            return;
         }
-        public static void JoinmapMarkdown(string command)
+
+        if (targets.Length > 1)
         {
-            var targets = command.Split(' ');
+            var deviceKey = targets[1].Trim();
 
-            var bridgeKey = targets[0].Trim();
-
-            var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
-
-            if (bridge == null)
-            {
-                Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
-                return;
-            }
-
-            if (targets.Length > 1)
-            {
-                var deviceKey = targets[1].Trim();
-
-                if (string.IsNullOrEmpty(deviceKey)) return;
-                bridge.MarkdownJoinMapForDevice(deviceKey, bridgeKey);
-            }
-            else
-            {
-                bridge.MarkdownForBridge(bridgeKey);
-
-            }
+            if (string.IsNullOrEmpty(deviceKey)) return;
+            bridge.PrintJoinMapForDevice(deviceKey);
+        }
+        else
+        {
+            bridge.PrintJoinMaps();
         }
     }
+    public static void JoinmapMarkdown(string command)
+    {
+        var targets = command.Split(' ');
 
+        var bridgeKey = targets[0].Trim();
+
+        var bridge = DeviceManager.GetDeviceForKey(bridgeKey) as EiscApiAdvanced;
+
+        if (bridge == null)
+        {
+            Debug.LogMessage(LogEventLevel.Information, "Unable to find advanced bridge with key: '{0}'", bridgeKey);
+            return;
+        }
+
+        if (targets.Length > 1)
+        {
+            var deviceKey = targets[1].Trim();
+
+            if (string.IsNullOrEmpty(deviceKey)) return;
+            bridge.MarkdownJoinMapForDevice(deviceKey, bridgeKey);
+        }
+        else
+        {
+            bridge.MarkdownForBridge(bridgeKey);
+
+        }
+    }
 }

src/PepperDash.Essentials.Core/Bridges/IBridge.cs

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

src/PepperDash.Essentials.Core/Bridges/JoinMaps/AirMediaControllerJoinMap.cs

@@ -1,71 +1,70 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class AirMediaControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class AirMediaControllerJoinMap : JoinMapBaseAdvanced
+    [JoinName("IsOnline")]
+    public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("IsInSession")]
+    public JoinDataComplete IsInSession = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media In Sharing Session", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("HdmiVideoSync")]
+    public JoinDataComplete HdmiVideoSync = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media Has HDMI Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("AutomaticInputRoutingEnabled")]
+    public JoinDataComplete AutomaticInputRoutingEnabled = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media Automatic Input Routing Enable(d)", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VideoOut")]
+    public JoinDataComplete VideoOut = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media Video Route Select / Feedback", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("ErrorFB")]
+    public JoinDataComplete ErrorFB = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media Error Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("NumberOfUsersConnectedFB")]
+    public JoinDataComplete NumberOfUsersConnectedFB = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media Number of Users Connected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("LoginCode")]
+    public JoinDataComplete LoginCode = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media Login Code Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Name")]
+    public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media Device Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("ConnectionAddressFB")]
+    public JoinDataComplete ConnectionAddressFB = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media IP Address", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("HostnameFB")]
+    public JoinDataComplete HostnameFB = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media Hostname", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("SerialNumberFeedback")]
+    public JoinDataComplete SerialNumberFeedback = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "Air Media Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+    
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public AirMediaControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(AirMediaControllerJoinMap))
     {
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IsInSession")]
-        public JoinDataComplete IsInSession = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media In Sharing Session", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("HdmiVideoSync")]
-        public JoinDataComplete HdmiVideoSync = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media Has HDMI Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("AutomaticInputRoutingEnabled")]
-        public JoinDataComplete AutomaticInputRoutingEnabled = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media Automatic Input Routing Enable(d)", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VideoOut")]
-        public JoinDataComplete VideoOut = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media Video Route Select / Feedback", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("ErrorFB")]
-        public JoinDataComplete ErrorFB = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media Error Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("NumberOfUsersConnectedFB")]
-        public JoinDataComplete NumberOfUsersConnectedFB = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media Number of Users Connected", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("LoginCode")]
-        public JoinDataComplete LoginCode = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media Login Code Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media Device Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("ConnectionAddressFB")]
-        public JoinDataComplete ConnectionAddressFB = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media IP Address", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("HostnameFB")]
-        public JoinDataComplete HostnameFB = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media Hostname", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("SerialNumberFeedback")]
-        public JoinDataComplete SerialNumberFeedback = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "Air Media Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-        
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public AirMediaControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(AirMediaControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected AirMediaControllerJoinMap(uint joinStart, Type type) : base(joinStart, type){}
     }
+
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected AirMediaControllerJoinMap(uint joinStart, Type type) : base(joinStart, type){}
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/AppleTvJoinMap.cs

@@ -1,53 +1,52 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class AppleTvJoinMap : JoinMapBaseAdvanced
 {
-    public class AppleTvJoinMap : JoinMapBaseAdvanced
+    [JoinName("UpArrow")]
+    public JoinDataComplete UpArrow = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "AppleTv Nav Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("DnArrow")]
+    public JoinDataComplete DnArrow = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "AppleTv Nav Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("LeftArrow")]
+    public JoinDataComplete LeftArrow = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "AppleTv Nav Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("RightArrow")]
+    public JoinDataComplete RightArrow = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "AppleTv Nav Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Menu")]
+    public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        new JoinMetadata { Description = "AppleTv Menu", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Select")]
+    public JoinDataComplete Select = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+        new JoinMetadata { Description = "AppleTv Select", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("PlayPause")]
+    public JoinDataComplete PlayPause = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
+        new JoinMetadata { Description = "AppleTv Play/Pause", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public AppleTvJoinMap(uint joinStart)
+        : base(joinStart, typeof(AppleTvJoinMap))
     {
-        [JoinName("UpArrow")]
-        public JoinDataComplete UpArrow = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "AppleTv Nav Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+    }
 
-        [JoinName("DnArrow")]
-        public JoinDataComplete DnArrow = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "AppleTv Nav Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("LeftArrow")]
-        public JoinDataComplete LeftArrow = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "AppleTv Nav Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("RightArrow")]
-        public JoinDataComplete RightArrow = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "AppleTv Nav Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Menu")]
-        public JoinDataComplete Menu = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "AppleTv Menu", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Select")]
-        public JoinDataComplete Select = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
-            new JoinMetadata { Description = "AppleTv Select", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("PlayPause")]
-        public JoinDataComplete PlayPause = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
-            new JoinMetadata { Description = "AppleTv Play/Pause", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public AppleTvJoinMap(uint joinStart)
-            : base(joinStart, typeof(AppleTvJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        public AppleTvJoinMap(uint joinStart, Type type) : base(joinStart, type)
-        {
-        }
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    public AppleTvJoinMap(uint joinStart, Type type) : base(joinStart, type)
+    {
     }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/C2nRthsControllerJoinMap.cs

@@ -1,45 +1,44 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class C2nRthsControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class C2nRthsControllerJoinMap : JoinMapBaseAdvanced
+    [JoinName("IsOnline")]
+    public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Temp Sensor Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("TemperatureFormat")]
+    public JoinDataComplete TemperatureFormat = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Temp Sensor Unit Format", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Temperature")]
+    public JoinDataComplete Temperature = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Temp Sensor Temperature Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Humidity")]
+    public JoinDataComplete Humidity = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "Temp Sensor Humidity Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Name")]
+    public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Temp Sensor Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public C2nRthsControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(C2nRthsControllerJoinMap))
     {
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Temp Sensor Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+    }
 
-        [JoinName("TemperatureFormat")]
-        public JoinDataComplete TemperatureFormat = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Temp Sensor Unit Format", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Temperature")]
-        public JoinDataComplete Temperature = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Temp Sensor Temperature Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Humidity")]
-        public JoinDataComplete Humidity = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Temp Sensor Humidity Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Temp Sensor Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public C2nRthsControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(C2nRthsControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected C2nRthsControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
-        {
-        }
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected C2nRthsControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
+    {
     }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/CameraControllerJoinMap.cs

@@ -1,69 +1,68 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+/// <summary>
+/// Join map for CameraBase devices
+/// </summary>
+public class CameraControllerJoinMap : JoinMapBaseAdvanced
 {
+    [JoinName("TiltUp")]
+    public JoinDataComplete TiltUp = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata { Description = "Tilt Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("TiltDown")]
+    public JoinDataComplete TiltDown = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata { Description = "Tilt Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("PanLeft")]
+    public JoinDataComplete PanLeft = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata { Description = "Pan Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("PanRight")]
+    public JoinDataComplete PanRight = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 }, new JoinMetadata { Description = "Pan Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("ZoomIn")]
+    public JoinDataComplete ZoomIn = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 }, new JoinMetadata { Description = "Zoom In", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("ZoomOut")]
+    public JoinDataComplete ZoomOut = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 }, new JoinMetadata { Description = "Zoom Out", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("IsOnline")]
+    public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 }, new JoinMetadata { Description = "Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("PowerOn")]
+    public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 }, new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("PowerOff")]
+    public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 }, new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("NumberOfPresets")]
+    public JoinDataComplete NumberOfPresets = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata { Description = "Tells Essentials the number of defined presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+    [JoinName("PresetRecallStart")]
+    public JoinDataComplete PresetRecallStart = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Recall Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("PresetLabelStart")]
+    public JoinDataComplete PresetLabelStart = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Label Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
+    [JoinName("PresetSaveStart")]
+    public JoinDataComplete PresetSaveStart = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Save Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("CameraModeAuto")]
+    public JoinDataComplete CameraModeAuto = new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Auto", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("CameraModeManual")]
+    public JoinDataComplete CameraModeManual = new JoinDataComplete(new JoinData { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Manual", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("CameraModeOff")]
+    public JoinDataComplete CameraModeOff = new JoinDataComplete(new JoinData { JoinNumber = 53, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("SupportsCameraModeAuto")]
+    public JoinDataComplete SupportsCameraModeAuto = new JoinDataComplete(new JoinData { JoinNumber = 55, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Camera Mode Auto", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("SupportsCameraModeOff")]
+    public JoinDataComplete SupportsCameraModeOff = new JoinDataComplete(new JoinData { JoinNumber = 56, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Camera Mode Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("SupportsPresets")]
+    public JoinDataComplete SupportsPresets = new JoinDataComplete(new JoinData { JoinNumber = 57, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
     /// <summary>
-    /// Join map for CameraBase devices
+    /// Constructor to use when instantiating this Join Map without inheriting from it
     /// </summary>
-    public class CameraControllerJoinMap : JoinMapBaseAdvanced
+    /// <param name="joinStart">Join this join map will start at</param>
+    public CameraControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(CameraControllerJoinMap))
     {
-        [JoinName("TiltUp")]
-        public JoinDataComplete TiltUp = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 }, new JoinMetadata { Description = "Tilt Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("TiltDown")]
-        public JoinDataComplete TiltDown = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 }, new JoinMetadata { Description = "Tilt Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PanLeft")]
-        public JoinDataComplete PanLeft = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 }, new JoinMetadata { Description = "Pan Left", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PanRight")]
-        public JoinDataComplete PanRight = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 }, new JoinMetadata { Description = "Pan Right", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ZoomIn")]
-        public JoinDataComplete ZoomIn = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 }, new JoinMetadata { Description = "Zoom In", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("ZoomOut")]
-        public JoinDataComplete ZoomOut = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 }, new JoinMetadata { Description = "Zoom Out", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 }, new JoinMetadata { Description = "Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PowerOn")]
-        public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 }, new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PowerOff")]
-        public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 }, new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("NumberOfPresets")]
-        public JoinDataComplete NumberOfPresets = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 }, new JoinMetadata { Description = "Tells Essentials the number of defined presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-        [JoinName("PresetRecallStart")]
-        public JoinDataComplete PresetRecallStart = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Recall Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("PresetLabelStart")]
-        public JoinDataComplete PresetLabelStart = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Label Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-        [JoinName("PresetSaveStart")]
-        public JoinDataComplete PresetSaveStart = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 20 }, new JoinMetadata { Description = "Preset Save Start", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CameraModeAuto")]
-        public JoinDataComplete CameraModeAuto = new JoinDataComplete(new JoinData { JoinNumber = 51, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Auto", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraModeManual")]
-        public JoinDataComplete CameraModeManual = new JoinDataComplete(new JoinData { JoinNumber = 52, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Manual", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("CameraModeOff")]
-        public JoinDataComplete CameraModeOff = new JoinDataComplete(new JoinData { JoinNumber = 53, JoinSpan = 1 }, new JoinMetadata { Description = "Camera Mode Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SupportsCameraModeAuto")]
-        public JoinDataComplete SupportsCameraModeAuto = new JoinDataComplete(new JoinData { JoinNumber = 55, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Camera Mode Auto", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SupportsCameraModeOff")]
-        public JoinDataComplete SupportsCameraModeOff = new JoinDataComplete(new JoinData { JoinNumber = 56, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Camera Mode Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-        [JoinName("SupportsPresets")]
-        public JoinDataComplete SupportsPresets = new JoinDataComplete(new JoinData { JoinNumber = 57, JoinSpan = 1 }, new JoinMetadata { Description = "Supports Presets", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public CameraControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(CameraControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected CameraControllerJoinMap(uint joinStart, Type type) : base(joinStart, type){}
     }
+
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected CameraControllerJoinMap(uint joinStart, Type type) : base(joinStart, type){}
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/CenOdtOccupancySensorBaseJoinMap.cs

@@ -1,198 +1,196 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class CenOdtOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
 {
-    public class CenOdtOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
+    #region Digitals
+
+    [JoinName("Online")]
+    public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("ForceOccupied")]
+    public JoinDataComplete ForceOccupied = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Force Occupied", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("ForceVacant")]
+    public JoinDataComplete ForceVacant = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "Force Vacant", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("EnableRawStates")]
+    public JoinDataComplete EnableRawStates = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "Enable Raw States", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("RoomOccupiedFeedback")]
+    public JoinDataComplete RoomOccupiedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Room Occupied Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("GraceOccupancyDetectedFeedback")]
+    public JoinDataComplete GraceOccupancyDetectedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "Grace Occupancy Detected Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("RoomVacantFeedback")]
+    public JoinDataComplete RoomVacantFeedback = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "Room Vacant Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("RawOccupancyFeedback")]
+    public JoinDataComplete RawOccupancyFeedback = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        new JoinMetadata { Description = "Raw Occupancy Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("RawOccupancyPirFeedback")]
+    public JoinDataComplete RawOccupancyPirFeedback = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+        new JoinMetadata { Description = "Raw Occupancy Pir Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("RawOccupancyUsFeedback")]
+    public JoinDataComplete RawOccupancyUsFeedback = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
+        new JoinMetadata { Description = "Raw Occupancy Us Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("IdentityModeOn")]
+    public JoinDataComplete IdentityMode = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
+        new JoinMetadata { Description = "Enable Identity Mode", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("IdentityModeFeedback")]
+    public JoinDataComplete IdentityModeFeedback = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
+        new JoinMetadata { Description = "Identity Mode Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("EnableLedFlash")]
+    public JoinDataComplete EnableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
+        new JoinMetadata { Description = "Enable Led Flash", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("DisableLedFlash")]
+    public JoinDataComplete DisableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
+        new JoinMetadata { Description = "Disable Led Flash", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("EnableShortTimeout")]
+    public JoinDataComplete EnableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
+        new JoinMetadata { Description = "Enable Short Timeout", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("DisableShortTimeout")]
+    public JoinDataComplete DisableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
+        new JoinMetadata { Description = "Disable Short Timeout", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("OrWhenVacated")]
+    public JoinDataComplete OrWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
+        new JoinMetadata { Description = "Or When Vacated", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("AndWhenVacated")]
+    public JoinDataComplete AndWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
+        new JoinMetadata { Description = "AndWhenVacated", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("EnableUsA")]
+    public JoinDataComplete EnableUsA = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
+        new JoinMetadata { Description = "Enable Us A", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("DisableUsA")]
+    public JoinDataComplete DisableUsA = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
+        new JoinMetadata { Description = "Disable Us A", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("EnableUsB")]
+    public JoinDataComplete EnableUsB = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
+        new JoinMetadata { Description = "Enable Us B", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("DisableUsB")]
+    public JoinDataComplete DisableUsB = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
+        new JoinMetadata { Description = "Disable Us B", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("EnablePir")]
+    public JoinDataComplete EnablePir = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
+        new JoinMetadata { Description = "Enable Pir", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("DisablePir")]
+    public JoinDataComplete DisablePir = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
+        new JoinMetadata { Description = "Disable Pir", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("IncrementUsInOccupiedState")]
+    public JoinDataComplete IncrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
+        new JoinMetadata { Description = "Increment Us In OccupiedState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("DecrementUsInOccupiedState")]
+    public JoinDataComplete DecrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
+        new JoinMetadata { Description = "Dencrement Us In Occupied State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("IncrementUsInVacantState")]
+    public JoinDataComplete IncrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
+        new JoinMetadata { Description = "Increment Us In VacantState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("DecrementUsInVacantState")]
+    public JoinDataComplete DecrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
+        new JoinMetadata { Description = "Decrement Us In VacantState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("IncrementPirInOccupiedState")]
+    public JoinDataComplete IncrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
+        new JoinMetadata { Description = "Increment Pir In Occupied State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("DecrementPirInOccupiedState")]
+    public JoinDataComplete DecrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
+        new JoinMetadata { Description = "Decrement Pir In OccupiedState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("IncrementPirInVacantState")]
+    public JoinDataComplete IncrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
+        new JoinMetadata { Description = "Increment Pir In Vacant State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("DecrementPirInVacantState")]
+    public JoinDataComplete DecrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
+        new JoinMetadata { Description = "Decrement Pir In Vacant State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    #endregion
+
+    #region Analog
+
+    [JoinName("Timeout")]
+    public JoinDataComplete Timeout = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Timeout", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("TimeoutLocalFeedback")]
+    public JoinDataComplete TimeoutLocalFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Timeout Local Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("InternalPhotoSensorValue")]
+    public JoinDataComplete InternalPhotoSensorValue = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "Internal PhotoSensor Value", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("UsSensitivityInOccupiedState")]
+    public JoinDataComplete UsSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        new JoinMetadata { Description = "Us Sensitivity In Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("UsSensitivityInVacantState")]
+    public JoinDataComplete UsSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+        new JoinMetadata { Description = "Us Sensitivity In Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("PirSensitivityInOccupiedState")]
+    public JoinDataComplete PirSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
+        new JoinMetadata { Description = "Pir Sensitivity In Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("PirSensitivityInVacantState")]
+    public JoinDataComplete PirSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
+        new JoinMetadata { Description = "Pir Sensitivity In Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    #endregion
+
+    #region Serial
+
+    [JoinName("Name")]
+    public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    #endregion
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public CenOdtOccupancySensorBaseJoinMap(uint joinStart)
+        : this(joinStart, typeof(CenOdtOccupancySensorBaseJoinMap))
     {
-        #region Digitals
-
-        [JoinName("Online")]
-        public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("ForceOccupied")]
-        public JoinDataComplete ForceOccupied = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Force Occupied", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("ForceVacant")]
-        public JoinDataComplete ForceVacant = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Force Vacant", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("EnableRawStates")]
-        public JoinDataComplete EnableRawStates = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "Enable Raw States", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("RoomOccupiedFeedback")]
-        public JoinDataComplete RoomOccupiedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Room Occupied Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("GraceOccupancyDetectedFeedback")]
-        public JoinDataComplete GraceOccupancyDetectedFeedback = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Grace Occupancy Detected Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("RoomVacantFeedback")]
-        public JoinDataComplete RoomVacantFeedback = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "Room Vacant Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("RawOccupancyFeedback")]
-        public JoinDataComplete RawOccupancyFeedback = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "Raw Occupancy Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("RawOccupancyPirFeedback")]
-        public JoinDataComplete RawOccupancyPirFeedback = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
-            new JoinMetadata { Description = "Raw Occupancy Pir Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("RawOccupancyUsFeedback")]
-        public JoinDataComplete RawOccupancyUsFeedback = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
-            new JoinMetadata { Description = "Raw Occupancy Us Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IdentityModeOn")]
-        public JoinDataComplete IdentityMode = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "Enable Identity Mode", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IdentityModeFeedback")]
-        public JoinDataComplete IdentityModeFeedback = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "Identity Mode Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("EnableLedFlash")]
-        public JoinDataComplete EnableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "Enable Led Flash", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DisableLedFlash")]
-        public JoinDataComplete DisableLedFlash = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
-            new JoinMetadata { Description = "Disable Led Flash", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("EnableShortTimeout")]
-        public JoinDataComplete EnableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
-            new JoinMetadata { Description = "Enable Short Timeout", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DisableShortTimeout")]
-        public JoinDataComplete DisableShortTimeout = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
-            new JoinMetadata { Description = "Disable Short Timeout", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OrWhenVacated")]
-        public JoinDataComplete OrWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
-            new JoinMetadata { Description = "Or When Vacated", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("AndWhenVacated")]
-        public JoinDataComplete AndWhenVacated = new JoinDataComplete(new JoinData { JoinNumber = 16, JoinSpan = 1 },
-            new JoinMetadata { Description = "AndWhenVacated", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("EnableUsA")]
-        public JoinDataComplete EnableUsA = new JoinDataComplete(new JoinData { JoinNumber = 17, JoinSpan = 1 },
-            new JoinMetadata { Description = "Enable Us A", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DisableUsA")]
-        public JoinDataComplete DisableUsA = new JoinDataComplete(new JoinData { JoinNumber = 18, JoinSpan = 1 },
-            new JoinMetadata { Description = "Disable Us A", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("EnableUsB")]
-        public JoinDataComplete EnableUsB = new JoinDataComplete(new JoinData { JoinNumber = 19, JoinSpan = 1 },
-            new JoinMetadata { Description = "Enable Us B", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DisableUsB")]
-        public JoinDataComplete DisableUsB = new JoinDataComplete(new JoinData { JoinNumber = 20, JoinSpan = 1 },
-            new JoinMetadata { Description = "Disable Us B", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("EnablePir")]
-        public JoinDataComplete EnablePir = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
-            new JoinMetadata { Description = "Enable Pir", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DisablePir")]
-        public JoinDataComplete DisablePir = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
-            new JoinMetadata { Description = "Disable Pir", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IncrementUsInOccupiedState")]
-        public JoinDataComplete IncrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
-            new JoinMetadata { Description = "Increment Us In OccupiedState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DecrementUsInOccupiedState")]
-        public JoinDataComplete DecrementUsInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
-            new JoinMetadata { Description = "Dencrement Us In Occupied State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IncrementUsInVacantState")]
-        public JoinDataComplete IncrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
-            new JoinMetadata { Description = "Increment Us In VacantState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DecrementUsInVacantState")]
-        public JoinDataComplete DecrementUsInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 26, JoinSpan = 1 },
-            new JoinMetadata { Description = "Decrement Us In VacantState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IncrementPirInOccupiedState")]
-        public JoinDataComplete IncrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 27, JoinSpan = 1 },
-            new JoinMetadata { Description = "Increment Pir In Occupied State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DecrementPirInOccupiedState")]
-        public JoinDataComplete DecrementPirInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 28, JoinSpan = 1 },
-            new JoinMetadata { Description = "Decrement Pir In OccupiedState", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IncrementPirInVacantState")]
-        public JoinDataComplete IncrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 29, JoinSpan = 1 },
-            new JoinMetadata { Description = "Increment Pir In Vacant State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("DecrementPirInVacantState")]
-        public JoinDataComplete DecrementPirInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 30, JoinSpan = 1 },
-            new JoinMetadata { Description = "Decrement Pir In Vacant State", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        #endregion
-
-        #region Analog
-
-        [JoinName("Timeout")]
-        public JoinDataComplete Timeout = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Timeout", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("TimeoutLocalFeedback")]
-        public JoinDataComplete TimeoutLocalFeedback = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Timeout Local Feedback", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("InternalPhotoSensorValue")]
-        public JoinDataComplete InternalPhotoSensorValue = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Internal PhotoSensor Value", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("UsSensitivityInOccupiedState")]
-        public JoinDataComplete UsSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "Us Sensitivity In Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("UsSensitivityInVacantState")]
-        public JoinDataComplete UsSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
-            new JoinMetadata { Description = "Us Sensitivity In Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("PirSensitivityInOccupiedState")]
-        public JoinDataComplete PirSensitivityInOccupiedState = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
-            new JoinMetadata { Description = "Pir Sensitivity In Occupied State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("PirSensitivityInVacantState")]
-        public JoinDataComplete PirSensitivityInVacantState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "Pir Sensitivity In Vacant State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        #endregion
-
-        #region Serial
-
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        #endregion
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public CenOdtOccupancySensorBaseJoinMap(uint joinStart)
-            : this(joinStart, typeof(CenOdtOccupancySensorBaseJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected CenOdtOccupancySensorBaseJoinMap(uint joinStart, Type type) : base(joinStart, type)
-        {
-        }
     }
 
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected CenOdtOccupancySensorBaseJoinMap(uint joinStart, Type type) : base(joinStart, type)
+    {
+    }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DisplayControllerJoinMap.cs

@@ -1,85 +1,84 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DisplayControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DisplayControllerJoinMap : JoinMapBaseAdvanced
+    [JoinName("Name")]
+    public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("PowerOff")]
+    public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 }, 
+        new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("PowerOn")]
+    public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 }, 
+        new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("IsTwoWayDisplay")]
+    public JoinDataComplete IsTwoWayDisplay = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 }, 
+        new JoinMetadata { Description = "Is Two Way Display", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VolumeUp")]
+    public JoinDataComplete VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 }, 
+        new JoinMetadata { Description = "Volume Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VolumeLevel")]
+    public JoinDataComplete VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        new JoinMetadata { Description = "Volume Level", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("VolumeDown")]
+    public JoinDataComplete VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 }, 
+        new JoinMetadata { Description = "Volume Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VolumeMute")]
+    public JoinDataComplete VolumeMute = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 }, 
+        new JoinMetadata { Description = "Volume Mute", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VolumeMuteOn")]
+    public JoinDataComplete VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 }, 
+        new JoinMetadata { Description = "Volume Mute On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VolumeMuteOff")]
+    public JoinDataComplete VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 }, 
+        new JoinMetadata { Description = "Volume Mute Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("InputSelectOffset")]
+    public JoinDataComplete InputSelectOffset = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 }, 
+        new JoinMetadata { Description = "Input Select", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("InputNamesOffset")]
+    public JoinDataComplete InputNamesOffset = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 }, 
+        new JoinMetadata { Description = "Input Names Offset", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("InputSelect")]
+    public JoinDataComplete InputSelect = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
+        new JoinMetadata { Description = "Input Select", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("ButtonVisibilityOffset")]
+    public JoinDataComplete ButtonVisibilityOffset = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 10 }, 
+        new JoinMetadata { Description = "Button Visibility Offset", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalSerial });
+
+    [JoinName("IsOnline")]
+    public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 }, 
+        new JoinMetadata { Description = "Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public DisplayControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(DisplayControllerJoinMap))
     {
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+    }
 
-        [JoinName("PowerOff")]
-        public JoinDataComplete PowerOff = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 }, 
-            new JoinMetadata { Description = "Power Off", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("PowerOn")]
-        public JoinDataComplete PowerOn = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 }, 
-            new JoinMetadata { Description = "Power On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IsTwoWayDisplay")]
-        public JoinDataComplete IsTwoWayDisplay = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 }, 
-            new JoinMetadata { Description = "Is Two Way Display", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VolumeUp")]
-        public JoinDataComplete VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 }, 
-            new JoinMetadata { Description = "Volume Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VolumeLevel")]
-        public JoinDataComplete VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "Volume Level", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("VolumeDown")]
-        public JoinDataComplete VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 }, 
-            new JoinMetadata { Description = "Volume Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VolumeMute")]
-        public JoinDataComplete VolumeMute = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 }, 
-            new JoinMetadata { Description = "Volume Mute", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VolumeMuteOn")]
-        public JoinDataComplete VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 }, 
-            new JoinMetadata { Description = "Volume Mute On", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VolumeMuteOff")]
-        public JoinDataComplete VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 }, 
-            new JoinMetadata { Description = "Volume Mute Off", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("InputSelectOffset")]
-        public JoinDataComplete InputSelectOffset = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 }, 
-            new JoinMetadata { Description = "Input Select", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("InputNamesOffset")]
-        public JoinDataComplete InputNamesOffset = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 }, 
-            new JoinMetadata { Description = "Input Names Offset", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("InputSelect")]
-        public JoinDataComplete InputSelect = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "Input Select", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("ButtonVisibilityOffset")]
-        public JoinDataComplete ButtonVisibilityOffset = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 10 }, 
-            new JoinMetadata { Description = "Button Visibility Offset", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalSerial });
-
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 50, JoinSpan = 1 }, 
-            new JoinMetadata { Description = "Is Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public DisplayControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(DisplayControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected DisplayControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
-        {
-        }
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected DisplayControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
+    {
     }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmBladeChassisControllerJoinMap.cs

@@ -1,74 +1,73 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges {
-    public class DmBladeChassisControllerJoinMap : JoinMapBaseAdvanced {
+namespace PepperDash.Essentials.Core.Bridges; 
+public class DmBladeChassisControllerJoinMap : JoinMapBaseAdvanced {
 
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM Blade Chassis Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("IsOnline")]
+    public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM Blade Chassis Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        [JoinName("VideoSyncStatus")]
-        public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
-            new JoinMetadata { Description = "DM Blade Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("VideoSyncStatus")]
+    public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
+        new JoinMetadata { Description = "DM Blade Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        [JoinName("InputEndpointOnline")]
-        public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 128 },
-            new JoinMetadata { Description = "DM Blade Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("InputEndpointOnline")]
+    public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 128 },
+        new JoinMetadata { Description = "DM Blade Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        [JoinName("OutputEndpointOnline")]
-        public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 128 },
-            new JoinMetadata { Description = "DM Blade Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("OutputEndpointOnline")]
+    public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 128 },
+        new JoinMetadata { Description = "DM Blade Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        [JoinName("TxAdvancedIsPresent")]
-        public JoinDataComplete TxAdvancedIsPresent = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 128 },
-            new JoinMetadata { Description = "DM Blade Chassis Tx Advanced Is Present", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+    [JoinName("TxAdvancedIsPresent")]
+    public JoinDataComplete TxAdvancedIsPresent = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 128 },
+        new JoinMetadata { Description = "DM Blade Chassis Tx Advanced Is Present", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
 
-        [JoinName("OutputVideo")]
-        public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
-            new JoinMetadata { Description = "DM Blade Chassis Output Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+    [JoinName("OutputVideo")]
+    public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
+        new JoinMetadata { Description = "DM Blade Chassis Output Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
 
-        [JoinName("HdcpSupportState")]
-        public JoinDataComplete HdcpSupportState = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 128 },
-            new JoinMetadata { Description = "DM Blade Chassis Input HDCP Support State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+    [JoinName("HdcpSupportState")]
+    public JoinDataComplete HdcpSupportState = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 128 },
+        new JoinMetadata { Description = "DM Blade Chassis Input HDCP Support State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
 
-        [JoinName("HdcpSupportCapability")]
-        public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 128 },
-            new JoinMetadata { Description = "DM Blade Chassis Input HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+    [JoinName("HdcpSupportCapability")]
+    public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 128 },
+        new JoinMetadata { Description = "DM Blade Chassis Input HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
 
-        [JoinName("InputNames")]
-        public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
-            new JoinMetadata { Description = "DM Blade Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+    [JoinName("InputNames")]
+    public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 128 },
+        new JoinMetadata { Description = "DM Blade Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        [JoinName("OutputNames")]
-        public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 128 },
-            new JoinMetadata { Description = "DM Blade Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+    [JoinName("OutputNames")]
+    public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 128 },
+        new JoinMetadata { Description = "DM Blade Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        [JoinName("OutputCurrentVideoInputNames")]
-        public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 128 },
-            new JoinMetadata { Description = "DM Blade Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+    [JoinName("OutputCurrentVideoInputNames")]
+    public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 128 },
+        new JoinMetadata { Description = "DM Blade Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
-        [JoinName("InputCurrentResolution")]
-        public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 128 },
-            new JoinMetadata { Description = "DM Blade Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+    [JoinName("InputCurrentResolution")]
+    public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 128 },
+        new JoinMetadata { Description = "DM Blade Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
 
 
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public DmBladeChassisControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(DmBladeChassisControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected DmBladeChassisControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
-        {
-        }
-
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public DmBladeChassisControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(DmBladeChassisControllerJoinMap))
+    {
     }
+
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected DmBladeChassisControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
+    {
+    }
+
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmChassisControllerJoinMap.cs

@@ -1,170 +1,169 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmChassisControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmChassisControllerJoinMap : JoinMapBaseAdvanced
+    [JoinName("EnableAudioBreakaway")]
+    public JoinDataComplete EnableAudioBreakaway = new JoinDataComplete(
+        new JoinData {JoinNumber = 4, JoinSpan = 1},
+        new JoinMetadata
+        {
+            Description = "DM Chassis enable audio breakaway routing",
+            JoinCapabilities = eJoinCapabilities.FromSIMPL,
+            JoinType = eJoinType.Digital
+        });
+
+    [JoinName("EnableUsbBreakaway")]
+    public JoinDataComplete EnableUsbBreakaway = new JoinDataComplete(
+        new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        new JoinMetadata
+        {
+            Description = "DM Chassis enable USB breakaway routing",
+            JoinCapabilities = eJoinCapabilities.FromSIMPL,
+            JoinType = eJoinType.Digital
+        });
+
+    [JoinName("Name")]
+    public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM Chassis Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("SystemId")]
+    public JoinDataComplete SystemId = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM Chassis SystemId Get/Set/Trigger/", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalAnalog });
+
+    [JoinName("IsOnline")]
+    public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM Chassis Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VideoSyncStatus")]
+    public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("InputEndpointOnline")]
+    public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("OutputEndpointOnline")]
+    public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("TxAdvancedIsPresent")]
+    public JoinDataComplete TxAdvancedIsPresent = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Tx Advanced Is Present", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("OutputDisabledByHdcp")]
+    public JoinDataComplete OutputDisabledByHdcp = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Output Disabled by HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("OutputVideo")]
+    public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Output Video Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("OutputAudio")]
+    public JoinDataComplete OutputAudio = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Output Audio Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("OutputUsb")]
+    public JoinDataComplete OutputUsb = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Output USB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("InputUsb")]
+    public JoinDataComplete InputUsb = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Input Usb Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("HdcpSupportState")]
+    public JoinDataComplete HdcpSupportState = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Input HDCP Support State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("HdcpSupportCapability")]
+    public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Input HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("InputStreamCardState")]
+    public JoinDataComplete InputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1501, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Stream Input Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("OutputStreamCardState")]
+    public JoinDataComplete OutputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1601, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Stream Output Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("NoRouteName")]
+    public JoinDataComplete NoRouteName = new JoinDataComplete(new JoinData { JoinNumber = 100, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("InputNames")]
+    public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("OutputNames")]
+    public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("InputVideoNames")] public JoinDataComplete InputVideoNames =
+        new JoinDataComplete(new JoinData {JoinNumber = 501, JoinSpan = 200},
+            new JoinMetadata
+            {
+                Description = "DM Chassis Video Input Names",
+                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+                JoinType = eJoinType.Serial
+            });
+
+    [JoinName("InputAudioNames")]
+    public JoinDataComplete InputAudioNames =
+        new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 200 },
+        new JoinMetadata
+        {
+            Description = "DM Chassis Audio Input Names",
+            JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+            JoinType = eJoinType.Serial
+        });
+    [JoinName("OutputVideoNames")]
+    public JoinDataComplete OutputVideoNames =
+        new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 200 },
+        new JoinMetadata
+        {
+            Description = "DM Chassis Video Output Names",
+            JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+            JoinType = eJoinType.Serial
+        });
+    [JoinName("OutputAudioNames")]
+    public JoinDataComplete OutputAudioNames =
+        new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 200 },
+        new JoinMetadata
+        {
+            Description = "DM Chassis Audio Output Names",
+            JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
+            JoinType = eJoinType.Serial
+        });
+
+    [JoinName("OutputCurrentVideoInputNames")]
+    public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("OutputCurrentAudioInputNames")]
+    public JoinDataComplete OutputCurrentAudioInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2201, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Audio Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("InputCurrentResolution")]
+    public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public DmChassisControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(DmChassisControllerJoinMap))
     {
-        [JoinName("EnableAudioBreakaway")]
-        public JoinDataComplete EnableAudioBreakaway = new JoinDataComplete(
-            new JoinData {JoinNumber = 4, JoinSpan = 1},
-            new JoinMetadata
-            {
-                Description = "DM Chassis enable audio breakaway routing",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
+    }
 
-        [JoinName("EnableUsbBreakaway")]
-        public JoinDataComplete EnableUsbBreakaway = new JoinDataComplete(
-            new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata
-            {
-                Description = "DM Chassis enable USB breakaway routing",
-                JoinCapabilities = eJoinCapabilities.FromSIMPL,
-                JoinType = eJoinType.Digital
-            });
-
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM Chassis Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("SystemId")]
-        public JoinDataComplete SystemId = new JoinDataComplete(new JoinData { JoinNumber = 10, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM Chassis SystemId Get/Set/Trigger/", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalAnalog });
-
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM Chassis Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VideoSyncStatus")]
-        public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("InputEndpointOnline")]
-        public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutputEndpointOnline")]
-        public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("TxAdvancedIsPresent")]
-        public JoinDataComplete TxAdvancedIsPresent = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Tx Advanced Is Present", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutputDisabledByHdcp")]
-        public JoinDataComplete OutputDisabledByHdcp = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Output Disabled by HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutputVideo")]
-        public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Output Video Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("OutputAudio")]
-        public JoinDataComplete OutputAudio = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Output Audio Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("OutputUsb")]
-        public JoinDataComplete OutputUsb = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Output USB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("InputUsb")]
-        public JoinDataComplete InputUsb = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Input Usb Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("HdcpSupportState")]
-        public JoinDataComplete HdcpSupportState = new JoinDataComplete(new JoinData { JoinNumber = 1001, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Input HDCP Support State", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("HdcpSupportCapability")]
-        public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 1201, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Input HDCP Support Capability", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("InputStreamCardState")]
-        public JoinDataComplete InputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1501, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Stream Input Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("OutputStreamCardState")]
-        public JoinDataComplete OutputStreamCardState = new JoinDataComplete(new JoinData { JoinNumber = 1601, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Stream Output Start (1), Stop (2), Pause (3) with Feedback", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("NoRouteName")]
-        public JoinDataComplete NoRouteName = new JoinDataComplete(new JoinData { JoinNumber = 100, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("InputNames")]
-        public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("OutputNames")]
-        public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("InputVideoNames")] public JoinDataComplete InputVideoNames =
-            new JoinDataComplete(new JoinData {JoinNumber = 501, JoinSpan = 200},
-                new JoinMetadata
-                {
-                    Description = "DM Chassis Video Input Names",
-                    JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                    JoinType = eJoinType.Serial
-                });
-
-        [JoinName("InputAudioNames")]
-        public JoinDataComplete InputAudioNames =
-            new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 200 },
-            new JoinMetadata
-            {
-                Description = "DM Chassis Audio Input Names",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-        [JoinName("OutputVideoNames")]
-        public JoinDataComplete OutputVideoNames =
-            new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 200 },
-            new JoinMetadata
-            {
-                Description = "DM Chassis Video Output Names",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-        [JoinName("OutputAudioNames")]
-        public JoinDataComplete OutputAudioNames =
-            new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 200 },
-            new JoinMetadata
-            {
-                Description = "DM Chassis Audio Output Names",
-                JoinCapabilities = eJoinCapabilities.ToFromSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("OutputCurrentVideoInputNames")]
-        public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("OutputCurrentAudioInputNames")]
-        public JoinDataComplete OutputCurrentAudioInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2201, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Audio Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("InputCurrentResolution")]
-        public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public DmChassisControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(DmChassisControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected DmChassisControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
-        {
-        }
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected DmChassisControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
+    {
     }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmRmcControllerJoinMap.cs

@@ -1,92 +1,91 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmRmcControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmRmcControllerJoinMap : JoinMapBaseAdvanced
+    [JoinName("IsOnline")]
+    public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VideoMuteOn")]
+    public JoinDataComplete VideoMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC Mute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VideoMuteOff")]
+    public JoinDataComplete VideoMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC UnMute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VideoMuteToggle")]
+    public JoinDataComplete VideoMuteToggle = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC Mute Video Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("CurrentOutputResolution")]
+    public JoinDataComplete CurrentOutputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC Current Output Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("EdidManufacturer")]
+    public JoinDataComplete EdidManufacturer = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC EDID Manufacturer", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("EdidName")]
+    public JoinDataComplete EdidName = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC EDID Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("EdidPrefferedTiming")]
+    public JoinDataComplete EdidPrefferedTiming = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC EDID Preferred Timing", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("EdidSerialNumber")]
+    public JoinDataComplete EdidSerialNumber = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC EDID Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("Name")]
+    public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("AudioVideoSource")]
+    public JoinDataComplete AudioVideoSource = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC Audio Video Source Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("HdcpSupportCapability")]
+    public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Port1HdcpState")]
+    public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC Port 1 (DM) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Port2HdcpState")]
+    public JoinDataComplete Port2HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Port 2 (HDMI) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("HdmiInputSync")]
+    public JoinDataComplete HdmiInputSync = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM RMC HDMI Input Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("HdcpInputPortCount")]
+    public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public DmRmcControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(DmRmcControllerJoinMap))
     {
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+    }
 
-        [JoinName("VideoMuteOn")]
-        public JoinDataComplete VideoMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Mute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VideoMuteOff")]
-        public JoinDataComplete VideoMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC UnMute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VideoMuteToggle")]
-        public JoinDataComplete VideoMuteToggle = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Mute Video Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CurrentOutputResolution")]
-        public JoinDataComplete CurrentOutputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Current Output Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("EdidManufacturer")]
-        public JoinDataComplete EdidManufacturer = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC EDID Manufacturer", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("EdidName")]
-        public JoinDataComplete EdidName = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC EDID Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("EdidPrefferedTiming")]
-        public JoinDataComplete EdidPrefferedTiming = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC EDID Preferred Timing", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("EdidSerialNumber")]
-        public JoinDataComplete EdidSerialNumber = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC EDID Serial Number", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("AudioVideoSource")]
-        public JoinDataComplete AudioVideoSource = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Audio Video Source Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("HdcpSupportCapability")]
-        public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Port1HdcpState")]
-        public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC Port 1 (DM) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Port2HdcpState")]
-        public JoinDataComplete Port2HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Port 2 (HDMI) HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("HdmiInputSync")]
-        public JoinDataComplete HdmiInputSync = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM RMC HDMI Input Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("HdcpInputPortCount")]
-        public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public DmRmcControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(DmRmcControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected DmRmcControllerJoinMap(uint joinStart, Type type)
-            : base(joinStart, type)
-        {
-        }
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected DmRmcControllerJoinMap(uint joinStart, Type type)
+        : base(joinStart, type)
+    {
     }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmTxControllerJoinMap.cs

@@ -1,96 +1,95 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmTxControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmTxControllerJoinMap : JoinMapBaseAdvanced
+    [JoinName("IsOnline")]
+    public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VideoSyncStatus")]
+    public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("FreeRunEnabled")]
+    public JoinDataComplete FreeRunEnabled = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Enable Free Run Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Input1VideoSyncStatus")]
+    public JoinDataComplete Input1VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "Input 1 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Input2VideoSyncStatus")]
+    public JoinDataComplete Input2VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        new JoinMetadata { Description = "Input 2 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Input3VideoSyncStatus")]
+    public JoinDataComplete Input3VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+        new JoinMetadata { Description = "Input 3 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("CurrentInputResolution")]
+    public JoinDataComplete CurrentInputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Current Input Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("Name")]
+    public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("VideoInput")]
+    public JoinDataComplete VideoInput = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Video Input Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("AudioInput")]
+    public JoinDataComplete AudioInput = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Audio Input Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("HdcpSupportCapability")]
+    public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Port1HdcpState")]
+    public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Port 1 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Port2HdcpState")]
+    public JoinDataComplete Port2HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Port 2 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("VgaBrightness")]
+    public JoinDataComplete VgaBrightness = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX VGA Brightness", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("VgaContrast")]
+    public JoinDataComplete VgaContrast = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Online", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Port3HdcpState")]
+    public JoinDataComplete Port3HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
+        new JoinMetadata { Description = "DM TX Port 3 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("HdcpInputPortCount")]
+    public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
+        new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
+
+
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public DmTxControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(DmTxControllerJoinMap))
     {
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+    }
 
-        [JoinName("VideoSyncStatus")]
-        public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("FreeRunEnabled")]
-        public JoinDataComplete FreeRunEnabled = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Enable Free Run Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Input1VideoSyncStatus")]
-        public JoinDataComplete Input1VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "Input 1 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Input2VideoSyncStatus")]
-        public JoinDataComplete Input2VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "Input 2 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Input3VideoSyncStatus")]
-        public JoinDataComplete Input3VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
-            new JoinMetadata { Description = "Input 3 Video Sync Status", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("CurrentInputResolution")]
-        public JoinDataComplete CurrentInputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Current Input Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("Name")]
-        public JoinDataComplete Name = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("VideoInput")]
-        public JoinDataComplete VideoInput = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Video Input Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("AudioInput")]
-        public JoinDataComplete AudioInput = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Audio Input Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("HdcpSupportCapability")]
-        public JoinDataComplete HdcpSupportCapability = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX HDCP Support Capability", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Port1HdcpState")]
-        public JoinDataComplete Port1HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Port 1 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Port2HdcpState")]
-        public JoinDataComplete Port2HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Port 2 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("VgaBrightness")]
-        public JoinDataComplete VgaBrightness = new JoinDataComplete(new JoinData { JoinNumber = 6, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX VGA Brightness", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("VgaContrast")]
-        public JoinDataComplete VgaContrast = new JoinDataComplete(new JoinData { JoinNumber = 7, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Online", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Port3HdcpState")]
-        public JoinDataComplete Port3HdcpState = new JoinDataComplete(new JoinData { JoinNumber = 8, JoinSpan = 1 },
-            new JoinMetadata { Description = "DM TX Port 3 HDCP State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("HdcpInputPortCount")]
-        public JoinDataComplete HdcpInputPortCount = new JoinDataComplete(new JoinData { JoinNumber = 9, JoinSpan = 1 },
-            new JoinMetadata { Description = "Number of Input Ports that support HDCP", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Analog });
-
-
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public DmTxControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(DmTxControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected DmTxControllerJoinMap(uint joinStart, Type type)
-            : base(joinStart, type)
-        {
-        }
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected DmTxControllerJoinMap(uint joinStart, Type type)
+        : base(joinStart, type)
+    {
     }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs

@@ -1,174 +1,173 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmpsAudioOutputControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmpsAudioOutputControllerJoinMap : JoinMapBaseAdvanced
+
+    [JoinName("MasterVolumeLevel")]
+    public JoinDataComplete MasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Master Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("MasterVolumeLevelScaled")]
+    public JoinDataComplete MasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Master Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("MixerPresetRecall")]
+    public JoinDataComplete MixerPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "Mixer Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("MixerEqPresetRecall")]
+    public JoinDataComplete MixerEqPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "Mixer Eq Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("MasterVolumeMuteOn")]
+    public JoinDataComplete MasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Master Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MasterVolumeMuteOff")]
+    public JoinDataComplete MasterVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Master Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MasterVolumeUp")]
+    public JoinDataComplete MasterVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "Master Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MasterVolumeDown")]
+    public JoinDataComplete MasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+        new JoinMetadata { Description = "Master Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MasterVolumeLevelScaledSend")]
+    public JoinDataComplete MasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+        new JoinMetadata { Description = "Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("SourceVolumeLevel")]
+    public JoinDataComplete SourceVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
+        new JoinMetadata { Description = "Source Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("SourceVolumeLevelScaled")]
+    public JoinDataComplete SourceVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
+        new JoinMetadata { Description = "Source Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("SourceVolumeMuteOn")]
+    public JoinDataComplete SourceVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
+        new JoinMetadata { Description = "Source Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("SourceVolumeMuteOff")]
+    public JoinDataComplete SourceVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
+        new JoinMetadata { Description = "Source Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("SourceVolumeUp")]
+    public JoinDataComplete SourceVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
+        new JoinMetadata { Description = "Source Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("SourceVolumeDown")]
+    public JoinDataComplete SourceVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
+        new JoinMetadata { Description = "Source Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("SourceVolumeLevelScaledSend")]
+    public JoinDataComplete SourceVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
+        new JoinMetadata { Description = "Source Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Codec1VolumeLevel")]
+    public JoinDataComplete Codec1VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec1 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Codec1VolumeLevelScaled")]
+    public JoinDataComplete Codec1VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec1 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Codec1VolumeMuteOn")]
+    public JoinDataComplete Codec1VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec1 Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Codec1VolumeMuteOff")]
+    public JoinDataComplete Codec1VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec1 Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Codec1VolumeUp")]
+    public JoinDataComplete Codec1VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec1 Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Codec1VolumeDown")]
+    public JoinDataComplete Codec1VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec1 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Codec1VolumeLevelScaledSend")]
+    public JoinDataComplete Codec1VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec1 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Codec2VolumeLevel")]
+    public JoinDataComplete Codec2VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec2 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Codec2VolumeLevelScaled")]
+    public JoinDataComplete Codec2VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec2 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("Codec2VolumeMuteOn")]
+    public JoinDataComplete Codec2VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec2 Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Codec2VolumeMuteOff")]
+    public JoinDataComplete Codec2VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec2 Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Codec2VolumeUp")]
+    public JoinDataComplete Codec2VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec2 Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Codec2VolumeDown")]
+    public JoinDataComplete Codec2VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec2 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("Codec2VolumeLevelScaledSend")]
+    public JoinDataComplete Codec2VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
+        new JoinMetadata { Description = "Codec2 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MicsMasterVolumeLevel")]
+    public JoinDataComplete MicsMasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
+        new JoinMetadata { Description = "MicsMaster Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("MicsMasterVolumeLevelScaled")]
+    public JoinDataComplete MicsMasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
+        new JoinMetadata { Description = "MicsMaster Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("MicsMasterVolumeMuteOn")]
+    public JoinDataComplete MicsMasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
+        new JoinMetadata { Description = "MicsMaster Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MicsMasterVolumeMuteOff")]
+    public JoinDataComplete MicsMasterVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
+        new JoinMetadata { Description = "MicsMaster Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MicsMasterVolumeUp")]
+    public JoinDataComplete MicsMasterVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
+        new JoinMetadata { Description = "MicsMaster Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MicsMasterVolumeDown")]
+    public JoinDataComplete MicsMasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 44, JoinSpan = 1 },
+        new JoinMetadata { Description = "MicsMaster Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MicsMasterVolumeLevelScaledSend")]
+    public JoinDataComplete MicsMasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 45, JoinSpan = 1 },
+        new JoinMetadata { Description = "Mics Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public DmpsAudioOutputControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(DmpsAudioOutputControllerJoinMap))
     {
+    }
 
-        [JoinName("MasterVolumeLevel")]
-        public JoinDataComplete MasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MasterVolumeLevelScaled")]
-        public JoinDataComplete MasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MixerPresetRecall")]
-        public JoinDataComplete MixerPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mixer Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MixerEqPresetRecall")]
-        public JoinDataComplete MixerEqPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mixer Eq Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MasterVolumeMuteOn")]
-        public JoinDataComplete MasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MasterVolumeMuteOff")]
-        public JoinDataComplete MasterVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MasterVolumeUp")]
-        public JoinDataComplete MasterVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MasterVolumeDown")]
-        public JoinDataComplete MasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MasterVolumeLevelScaledSend")]
-        public JoinDataComplete MasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
-            new JoinMetadata { Description = "Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SourceVolumeLevel")]
-        public JoinDataComplete SourceVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("SourceVolumeLevelScaled")]
-        public JoinDataComplete SourceVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("SourceVolumeMuteOn")]
-        public JoinDataComplete SourceVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SourceVolumeMuteOff")]
-        public JoinDataComplete SourceVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SourceVolumeUp")]
-        public JoinDataComplete SourceVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SourceVolumeDown")]
-        public JoinDataComplete SourceVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SourceVolumeLevelScaledSend")]
-        public JoinDataComplete SourceVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
-            new JoinMetadata { Description = "Source Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Codec1VolumeLevel")]
-        public JoinDataComplete Codec1VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Codec1VolumeLevelScaled")]
-        public JoinDataComplete Codec1VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Codec1VolumeMuteOn")]
-        public JoinDataComplete Codec1VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 21, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Codec1VolumeMuteOff")]
-        public JoinDataComplete Codec1VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 22, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Codec1VolumeUp")]
-        public JoinDataComplete Codec1VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 23, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Codec1VolumeDown")]
-        public JoinDataComplete Codec1VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 24, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Codec1VolumeLevelScaledSend")]
-        public JoinDataComplete Codec1VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 25, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec1 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Codec2VolumeLevel")]
-        public JoinDataComplete Codec2VolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Codec2VolumeLevelScaled")]
-        public JoinDataComplete Codec2VolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("Codec2VolumeMuteOn")]
-        public JoinDataComplete Codec2VolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 31, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Codec2VolumeMuteOff")]
-        public JoinDataComplete Codec2VolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 32, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Codec2VolumeUp")]
-        public JoinDataComplete Codec2VolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 33, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Codec2VolumeDown")]
-        public JoinDataComplete Codec2VolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 34, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("Codec2VolumeLevelScaledSend")]
-        public JoinDataComplete Codec2VolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 35, JoinSpan = 1 },
-            new JoinMetadata { Description = "Codec2 Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicsMasterVolumeLevel")]
-        public JoinDataComplete MicsMasterVolumeLevel = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume Signed dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MicsMasterVolumeLevelScaled")]
-        public JoinDataComplete MicsMasterVolumeLevelScaled = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MicsMasterVolumeMuteOn")]
-        public JoinDataComplete MicsMasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicsMasterVolumeMuteOff")]
-        public JoinDataComplete MicsMasterVolumeMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 42, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicsMasterVolumeUp")]
-        public JoinDataComplete MicsMasterVolumeUp = new JoinDataComplete(new JoinData { JoinNumber = 43, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume Level Up", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicsMasterVolumeDown")]
-        public JoinDataComplete MicsMasterVolumeDown = new JoinDataComplete(new JoinData { JoinNumber = 44, JoinSpan = 1 },
-            new JoinMetadata { Description = "MicsMaster Volume Level Down", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicsMasterVolumeLevelScaledSend")]
-        public JoinDataComplete MicsMasterVolumeLevelScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 45, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mics Master Volume Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public DmpsAudioOutputControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(DmpsAudioOutputControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected DmpsAudioOutputControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
-        {
-        }
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected DmpsAudioOutputControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
+    {
     }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsMicrophoneControllerJoinMap.cs

@@ -1,50 +1,49 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced
+    [JoinName("MicGain")]
+    public JoinDataComplete MicGain = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Mic Gain dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("MicGainScaled")]
+    public JoinDataComplete MicGainScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Mic Gain 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("MicMuteOn")]
+    public JoinDataComplete MicMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Mic Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MicMuteOff")]
+    public JoinDataComplete MicMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
+        new JoinMetadata { Description = "Mic Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MicGainScaledSend")]
+    public JoinDataComplete MicGainScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+        new JoinMetadata { Description = "Mic Gain Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("MicName")]
+    public JoinDataComplete MicName = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Mic Name Get", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public DmpsMicrophoneControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(DmpsMicrophoneControllerJoinMap))
     {
-        [JoinName("MicGain")]
-        public JoinDataComplete MicGain = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Gain dB Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+    }
 
-        [JoinName("MicGainScaled")]
-        public JoinDataComplete MicGainScaled = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Gain 16bit Scaled Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("MicMuteOn")]
-        public JoinDataComplete MicMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicMuteOff")]
-        public JoinDataComplete MicMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 2, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Mute Off Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicGainScaledSend")]
-        public JoinDataComplete MicGainScaledSend = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Gain Scaled Send Enable/Disable", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("MicName")]
-        public JoinDataComplete MicName = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Mic Name Get", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public DmpsMicrophoneControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(DmpsMicrophoneControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected DmpsMicrophoneControllerJoinMap(uint joinStart, Type type)
-            : base(joinStart, type)
-        {
-        }
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected DmpsMicrophoneControllerJoinMap(uint joinStart, Type type)
+        : base(joinStart, type)
+    {
     }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/DmpsRoutingControllerJoinMap.cs

@@ -1,123 +1,122 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
+    [JoinName("EnableRouting")]
+    public JoinDataComplete EnableRouting = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "DMPS Enable Audio and Video Routing", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("SystemPowerOn")]
+    public JoinDataComplete SystemPowerOn = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
+        new JoinMetadata { Description = "DMPS System Power On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("SystemPowerOff")]
+    public JoinDataComplete SystemPowerOff = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
+        new JoinMetadata { Description = "DMPS System Power Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("FrontPanelLockOn")]
+    public JoinDataComplete FrontPanelLockOn = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
+        new JoinMetadata { Description = "DMPS Front Panel Lock On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("FrontPanelLockOff")]
+    public JoinDataComplete FrontPanelLockOff = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
+        new JoinMetadata { Description = "DMPS Front Panel Lock  Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("VideoSyncStatus")]
+    public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("InputEndpointOnline")]
+    public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("OutputEndpointOnline")]
+    public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("OutputVideo")]
+    public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Output Video Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("OutputAudio")]
+    public JoinDataComplete OutputAudio = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Output Audio Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
+
+    [JoinName("InputNames")]
+    public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("OutputNames")]
+    public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("InputVideoNames")]
+    public JoinDataComplete InputVideoNames =
+        new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
+        new JoinMetadata
+        {
+            Description = "Video Input Name",
+            JoinCapabilities = eJoinCapabilities.ToSIMPL,
+            JoinType = eJoinType.Serial
+        });
+
+    [JoinName("InputAudioNames")]
+    public JoinDataComplete InputAudioNames =
+        new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
+        new JoinMetadata
+        {
+            Description = "Audio Input Name",
+            JoinCapabilities = eJoinCapabilities.ToSIMPL,
+            JoinType = eJoinType.Serial
+        });
+    [JoinName("OutputVideoNames")]
+    public JoinDataComplete OutputVideoNames =
+        new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 32 },
+        new JoinMetadata
+        {
+            Description = "Video Output Name",
+            JoinCapabilities = eJoinCapabilities.ToSIMPL,
+            JoinType = eJoinType.Serial
+        });
+    [JoinName("OutputAudioNames")]
+    public JoinDataComplete OutputAudioNames =
+        new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 32 },
+        new JoinMetadata
+        {
+            Description = "Audio Output Name",
+            JoinCapabilities = eJoinCapabilities.ToSIMPL,
+            JoinType = eJoinType.Serial
+        });
+
+    [JoinName("OutputCurrentVideoInputNames")]
+    public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("OutputCurrentAudioInputNames")]
+    public JoinDataComplete OutputCurrentAudioInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2201, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Audio Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    [JoinName("InputCurrentResolution")]
+    public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 32 },
+        new JoinMetadata { Description = "DM Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public DmpsRoutingControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(DmpsRoutingControllerJoinMap))
     {
-        [JoinName("EnableRouting")]
-        public JoinDataComplete EnableRouting = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS Enable Audio and Video Routing", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+    }
 
-        [JoinName("SystemPowerOn")]
-        public JoinDataComplete SystemPowerOn = new JoinDataComplete(new JoinData { JoinNumber = 12, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS System Power On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SystemPowerOff")]
-        public JoinDataComplete SystemPowerOff = new JoinDataComplete(new JoinData { JoinNumber = 13, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS System Power Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("FrontPanelLockOn")]
-        public JoinDataComplete FrontPanelLockOn = new JoinDataComplete(new JoinData { JoinNumber = 14, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS Front Panel Lock On Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("FrontPanelLockOff")]
-        public JoinDataComplete FrontPanelLockOff = new JoinDataComplete(new JoinData { JoinNumber = 15, JoinSpan = 1 },
-            new JoinMetadata { Description = "DMPS Front Panel Lock  Off Get/Set", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("VideoSyncStatus")]
-        public JoinDataComplete VideoSyncStatus = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Input Video Sync", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("InputEndpointOnline")]
-        public JoinDataComplete InputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Input Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutputEndpointOnline")]
-        public JoinDataComplete OutputEndpointOnline = new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Output Endpoint Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("OutputVideo")]
-        public JoinDataComplete OutputVideo = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Output Video Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("OutputAudio")]
-        public JoinDataComplete OutputAudio = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Output Audio Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Analog });
-
-        [JoinName("InputNames")]
-        public JoinDataComplete InputNames = new JoinDataComplete(new JoinData { JoinNumber = 101, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("OutputNames")]
-        public JoinDataComplete OutputNames = new JoinDataComplete(new JoinData { JoinNumber = 301, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Output Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("InputVideoNames")]
-        public JoinDataComplete InputVideoNames =
-            new JoinDataComplete(new JoinData { JoinNumber = 501, JoinSpan = 32 },
-            new JoinMetadata
-            {
-                Description = "Video Input Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("InputAudioNames")]
-        public JoinDataComplete InputAudioNames =
-            new JoinDataComplete(new JoinData { JoinNumber = 701, JoinSpan = 32 },
-            new JoinMetadata
-            {
-                Description = "Audio Input Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-        [JoinName("OutputVideoNames")]
-        public JoinDataComplete OutputVideoNames =
-            new JoinDataComplete(new JoinData { JoinNumber = 901, JoinSpan = 32 },
-            new JoinMetadata
-            {
-                Description = "Video Output Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-        [JoinName("OutputAudioNames")]
-        public JoinDataComplete OutputAudioNames =
-            new JoinDataComplete(new JoinData { JoinNumber = 1101, JoinSpan = 32 },
-            new JoinMetadata
-            {
-                Description = "Audio Output Name",
-                JoinCapabilities = eJoinCapabilities.ToSIMPL,
-                JoinType = eJoinType.Serial
-            });
-
-        [JoinName("OutputCurrentVideoInputNames")]
-        public JoinDataComplete OutputCurrentVideoInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2001, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Video Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("OutputCurrentAudioInputNames")]
-        public JoinDataComplete OutputCurrentAudioInputNames = new JoinDataComplete(new JoinData { JoinNumber = 2201, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Audio Output Currently Routed Video Input Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        [JoinName("InputCurrentResolution")]
-        public JoinDataComplete InputCurrentResolution = new JoinDataComplete(new JoinData { JoinNumber = 2401, JoinSpan = 32 },
-            new JoinMetadata { Description = "DM Chassis Input Current Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public DmpsRoutingControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(DmpsRoutingControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected DmpsRoutingControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
-        {
-        }
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected DmpsRoutingControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
+    {
     }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericIrControllerJoinMap.cs

@@ -1,7 +1,7 @@
 using PepperDash.Essentials.Core;
 
-namespace PepperDash.Essentials.Core.Bridges.JoinMaps
-{
+namespace PepperDash.Essentials.Core.Bridges.JoinMaps;
+
 		public sealed class GenericIrControllerJoinMap : JoinMapBaseAdvanced
 		{
 			[JoinName("PLAY")]
@@ -823,5 +823,4 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
 				: base(joinStart, typeof(GenericIrControllerJoinMap))
 			{
 			}
-	}
-}
+	}

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericLightingJoinMap.cs

@@ -1,49 +1,48 @@
 using System;
 
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class GenericLightingJoinMap : JoinMapBaseAdvanced
 {
-    public class GenericLightingJoinMap : JoinMapBaseAdvanced
+
+    [JoinName("IsOnline")]
+    public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Lighting Controller Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("SelectScene")]
+    public JoinDataComplete SelectScene = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Lighting Controller Select Scene By Index", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("SelectSceneDirect")]
+    public JoinDataComplete SelectSceneDirect = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 },
+        new JoinMetadata { Description = "Lighting Controller Select Scene", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalSerial });
+
+    [JoinName("ButtonVisibility")]
+    public JoinDataComplete ButtonVisibility = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 10 },
+        new JoinMetadata { Description = "Lighting Controller Button Visibility", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+
+    [JoinName("IntegrationIdSet")]
+    public JoinDataComplete IntegrationIdSet = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Lighting Controller Set Integration Id", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
+
+
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public GenericLightingJoinMap(uint joinStart)
+        : this(joinStart, typeof(GenericLightingJoinMap))
     {
+    }
 
-        [JoinName("IsOnline")]
-        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Lighting Controller Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SelectScene")]
-        public JoinDataComplete SelectScene = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Lighting Controller Select Scene By Index", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("SelectSceneDirect")]
-        public JoinDataComplete SelectSceneDirect = new JoinDataComplete(new JoinData { JoinNumber = 11, JoinSpan = 10 },
-            new JoinMetadata { Description = "Lighting Controller Select Scene", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.DigitalSerial });
-
-        [JoinName("ButtonVisibility")]
-        public JoinDataComplete ButtonVisibility = new JoinDataComplete(new JoinData { JoinNumber = 41, JoinSpan = 10 },
-            new JoinMetadata { Description = "Lighting Controller Button Visibility", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
-
-        [JoinName("IntegrationIdSet")]
-        public JoinDataComplete IntegrationIdSet = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Lighting Controller Set Integration Id", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Serial });
-
-
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public GenericLightingJoinMap(uint joinStart)
-            : this(joinStart, typeof(GenericLightingJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected GenericLightingJoinMap(uint joinStart, Type type) : base(joinStart, type)
-        {
-        }
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected GenericLightingJoinMap(uint joinStart, Type type) : base(joinStart, type)
+    {
     }
 }

src/PepperDash.Essentials.Core/Bridges/JoinMaps/GenericRelayControllerJoinMap.cs

@@ -1,31 +1,30 @@
 using System;
 
-namespace PepperDash.Essentials.Core.Bridges
+namespace PepperDash.Essentials.Core.Bridges;
+
+public class GenericRelayControllerJoinMap : JoinMapBaseAdvanced
 {
-    public class GenericRelayControllerJoinMap : JoinMapBaseAdvanced
+
+    [JoinName("Relay")]
+    public JoinDataComplete Relay = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
+        new JoinMetadata { Description = "Device Relay State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+    /// <summary>
+    /// Constructor to use when instantiating this Join Map without inheriting from it
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    public GenericRelayControllerJoinMap(uint joinStart)
+        : this(joinStart, typeof(GenericRelayControllerJoinMap))
     {
+    }
 
-        [JoinName("Relay")]
-        public JoinDataComplete Relay = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "Device Relay State Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
-
-        /// <summary>
-        /// Constructor to use when instantiating this Join Map without inheriting from it
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        public GenericRelayControllerJoinMap(uint joinStart)
-            : this(joinStart, typeof(GenericRelayControllerJoinMap))
-        {
-        }
-
-        /// <summary>
-        /// Constructor to use when extending this Join map
-        /// </summary>
-        /// <param name="joinStart">Join this join map will start at</param>
-        /// <param name="type">Type of the child join map</param>
-        protected GenericRelayControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
-        {
-            
-        }
+    /// <summary>
+    /// Constructor to use when extending this Join map
+    /// </summary>
+    /// <param name="joinStart">Join this join map will start at</param>
+    /// <param name="type">Type of the child join map</param>
+    protected GenericRelayControllerJoinMap(uint joinStart, Type type) : base(joinStart, type)
+    {
+        
     }
 }