mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-15 12:44:58 +00:00
Compare commits
2 Commits
v2.12.3-fi
...
copilot/fi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1676ba7649 | ||
|
|
046b6fdb3b |
36
.github/workflows/unit-tests.yml
vendored
Normal file
36
.github/workflows/unit-tests.yml
vendored
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
name: Unit Tests
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ main, develop ]
|
||||||
|
pull_request:
|
||||||
|
branches: [ main, develop ]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Setup .NET
|
||||||
|
uses: actions/setup-dotnet@v4
|
||||||
|
with:
|
||||||
|
dotnet-version: '8.0.x'
|
||||||
|
|
||||||
|
- name: Restore dependencies
|
||||||
|
run: dotnet restore tests/PepperDash.Essentials.Core.Tests/PepperDash.Essentials.Core.Tests.csproj
|
||||||
|
|
||||||
|
- name: Build tests
|
||||||
|
run: dotnet build tests/PepperDash.Essentials.Core.Tests/PepperDash.Essentials.Core.Tests.csproj --no-restore
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: dotnet test tests/PepperDash.Essentials.Core.Tests/PepperDash.Essentials.Core.Tests.csproj --no-build --verbosity normal --collect:"XPlat Code Coverage"
|
||||||
|
|
||||||
|
- name: Upload coverage reports to Codecov
|
||||||
|
uses: codecov/codecov-action@v3
|
||||||
|
with:
|
||||||
|
files: ./tests/PepperDash.Essentials.Core.Tests/TestResults/*/coverage.cobertura.xml
|
||||||
|
flags: unittests
|
||||||
|
name: codecov-umbrella
|
||||||
|
fail_ci_if_error: false
|
||||||
9
.gitignore
vendored
9
.gitignore
vendored
@@ -60,6 +60,15 @@ bld/
|
|||||||
[Ll]og/
|
[Ll]og/
|
||||||
[Ll]ogs/
|
[Ll]ogs/
|
||||||
|
|
||||||
|
# Test results and coverage
|
||||||
|
TestResults/
|
||||||
|
coverage/
|
||||||
|
*.trx
|
||||||
|
*.coverage
|
||||||
|
*.coveragexml
|
||||||
|
coverage.cobertura.xml
|
||||||
|
coverage-report/
|
||||||
|
|
||||||
# Visual Studio 2015/2017 cache/options directory
|
# Visual Studio 2015/2017 cache/options directory
|
||||||
.vs/
|
.vs/
|
||||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
# Uncomment if you have tasks that create the project's static files in wwwroot
|
||||||
|
|||||||
@@ -1,282 +0,0 @@
|
|||||||
# Crestron Library Usage Analysis - PepperDash Essentials
|
|
||||||
|
|
||||||
This document provides a comprehensive analysis of Crestron classes and interfaces used throughout the PepperDash Essentials framework, organized by namespace and library component.
|
|
||||||
|
|
||||||
## Executive Summary
|
|
||||||
|
|
||||||
The PepperDash Essentials framework extensively leverages Crestron SDK components across 100+ files, providing abstractions for:
|
|
||||||
- Control system hardware (processors, touchpanels, IO devices)
|
|
||||||
- Communication interfaces (Serial, TCP/IP, SSH, CEC, IR)
|
|
||||||
- Device management and routing
|
|
||||||
- User interface components and smart objects
|
|
||||||
- System monitoring and diagnostics
|
|
||||||
|
|
||||||
## 1. Core Crestron Libraries
|
|
||||||
|
|
||||||
### 1.1 Crestron.SimplSharp
|
|
||||||
|
|
||||||
**Primary Usage**: Foundational framework components, collections, and basic types.
|
|
||||||
|
|
||||||
**Key Files**:
|
|
||||||
- Multiple files across all projects use `Crestron.SimplSharp` namespaces
|
|
||||||
- Provides basic C# runtime support for Crestron processors
|
|
||||||
|
|
||||||
### 1.2 Crestron.SimplSharpPro
|
|
||||||
|
|
||||||
**Primary Usage**: Main hardware abstraction layer for Crestron devices.
|
|
||||||
|
|
||||||
**Key Classes Used**:
|
|
||||||
|
|
||||||
#### CrestronControlSystem
|
|
||||||
- **File**: `/src/PepperDash.Essentials/ControlSystem.cs`
|
|
||||||
- **Usage**: Base class for the main control system implementation
|
|
||||||
- **Implementation**: `public class ControlSystem : CrestronControlSystem, ILoadConfig`
|
|
||||||
|
|
||||||
#### Device (Base Class)
|
|
||||||
- **Files**: 50+ files inherit from or use this class
|
|
||||||
- **Key Implementations**:
|
|
||||||
- `/src/PepperDash.Core/Device.cs` - Core device abstraction
|
|
||||||
- `/src/PepperDash.Essentials.Core/Devices/EssentialsDevice.cs` - Extended device base
|
|
||||||
- `/src/PepperDash.Essentials.Core/Room/Room.cs` - Room device implementation
|
|
||||||
- `/src/PepperDash.Essentials.Core/Devices/CrestronProcessor.cs` - Processor device wrapper
|
|
||||||
|
|
||||||
#### BasicTriList
|
|
||||||
- **Files**: 30+ files use this class extensively
|
|
||||||
- **Primary Usage**: Touchpanel communication and SIMPL bridging
|
|
||||||
- **Key Files**:
|
|
||||||
- `/src/PepperDash.Essentials.Core/Touchpanels/TriListExtensions.cs` - Extension methods for signal handling
|
|
||||||
- `/src/PepperDash.Essentials.Core/Devices/EssentialsBridgeableDevice.cs` - Bridge interface
|
|
||||||
- `/src/PepperDash.Essentials.Core/Touchpanels/ModalDialog.cs` - UI dialog implementation
|
|
||||||
|
|
||||||
#### BasicTriListWithSmartObject
|
|
||||||
- **Files**: Multiple touchpanel and UI files
|
|
||||||
- **Usage**: Enhanced touchpanel support with smart object integration
|
|
||||||
- **Key Files**:
|
|
||||||
- `/src/PepperDash.Essentials.Core/Touchpanels/Interfaces.cs` - Interface definitions
|
|
||||||
- `/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferenceList/SubpageReferenceList.cs`
|
|
||||||
|
|
||||||
## 2. Communication Hardware
|
|
||||||
|
|
||||||
### 2.1 Serial Communication (ComPort)
|
|
||||||
|
|
||||||
**Primary Class**: `ComPort`
|
|
||||||
**Key Files**:
|
|
||||||
- `/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs`
|
|
||||||
- `/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs`
|
|
||||||
|
|
||||||
**Usage Pattern**:
|
|
||||||
```csharp
|
|
||||||
public class ComPortController : Device, IBasicCommunicationWithStreamDebugging
|
|
||||||
public static ComPort GetComPort(EssentialsControlPropertiesConfig config)
|
|
||||||
```
|
|
||||||
|
|
||||||
**Interface Support**: `IComPorts` - Used for devices that provide multiple COM ports
|
|
||||||
|
|
||||||
### 2.2 IR Communication (IROutputPort)
|
|
||||||
|
|
||||||
**Primary Class**: `IROutputPort`
|
|
||||||
**Key Files**:
|
|
||||||
- `/src/PepperDash.Essentials.Core/Devices/IrOutputPortController.cs`
|
|
||||||
- `/src/PepperDash.Essentials.Core/Devices/GenericIRController.cs`
|
|
||||||
- `/src/PepperDash.Essentials.Core/Comm and IR/IRPortHelper.cs`
|
|
||||||
|
|
||||||
**Usage Pattern**:
|
|
||||||
```csharp
|
|
||||||
public class IrOutputPortController : Device
|
|
||||||
IROutputPort IrPort;
|
|
||||||
public IrOutputPortController(string key, IROutputPort port, string irDriverFilepath)
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2.3 CEC Communication (ICec)
|
|
||||||
|
|
||||||
**Primary Interface**: `ICec`
|
|
||||||
**Key Files**:
|
|
||||||
- `/src/PepperDash.Essentials.Core/Comm and IR/CecPortController.cs`
|
|
||||||
- `/src/PepperDash.Essentials.Core/Comm and IR/CommFactory.cs`
|
|
||||||
|
|
||||||
**Usage Pattern**:
|
|
||||||
```csharp
|
|
||||||
public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
|
|
||||||
public static ICec GetCecPort(ControlPropertiesConfig config)
|
|
||||||
```
|
|
||||||
|
|
||||||
## 3. Input/Output Hardware
|
|
||||||
|
|
||||||
### 3.1 Digital Input
|
|
||||||
|
|
||||||
**Primary Interface**: `IDigitalInput`
|
|
||||||
**Key Files**:
|
|
||||||
- `/src/PepperDash.Essentials.Core/CrestronIO/GenericDigitalInputDevice.cs`
|
|
||||||
- `/src/PepperDash.Essentials.Core/Microphone Privacy/MicrophonePrivacyController.cs`
|
|
||||||
|
|
||||||
**Usage Pattern**:
|
|
||||||
```csharp
|
|
||||||
public List<IDigitalInput> Inputs { get; private set; }
|
|
||||||
void AddInput(IDigitalInput input)
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3.2 Versiport Support
|
|
||||||
|
|
||||||
**Key Files**:
|
|
||||||
- `/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportInputDevice.cs`
|
|
||||||
- `/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportAnalogInputDevice.cs`
|
|
||||||
- `/src/PepperDash.Essentials.Core/CrestronIO/GenericVersiportOutputDevice.cs`
|
|
||||||
|
|
||||||
**Usage**: Provides flexible I/O port configuration for various signal types
|
|
||||||
|
|
||||||
## 4. Touchpanel Hardware
|
|
||||||
|
|
||||||
### 4.1 MPC3 Touchpanel
|
|
||||||
|
|
||||||
**Primary Class**: `MPC3Basic`
|
|
||||||
**Key File**: `/src/PepperDash.Essentials.Core/Touchpanels/Mpc3Touchpanel.cs`
|
|
||||||
|
|
||||||
**Usage Pattern**:
|
|
||||||
```csharp
|
|
||||||
public class Mpc3TouchpanelController : Device
|
|
||||||
readonly MPC3Basic _touchpanel;
|
|
||||||
_touchpanel = processor.ControllerTouchScreenSlotDevice as MPC3Basic;
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4.2 TSW Series Support
|
|
||||||
|
|
||||||
**Evidence**: References found in messenger files and mobile control components
|
|
||||||
**Usage**: Integrated through mobile control messaging system for TSW touchpanel features
|
|
||||||
|
|
||||||
## 5. Timer and Threading
|
|
||||||
|
|
||||||
### 5.1 CTimer
|
|
||||||
|
|
||||||
**Primary Class**: `CTimer`
|
|
||||||
**Key File**: `/src/PepperDash.Core/PasswordManagement/PasswordManager.cs`
|
|
||||||
|
|
||||||
**Usage Pattern**:
|
|
||||||
```csharp
|
|
||||||
Debug.Console(1, string.Format("PasswordManager.UpdatePassword: CTimer Started"));
|
|
||||||
Debug.Console(1, string.Format("PasswordManager.UpdatePassword: CTimer Reset"));
|
|
||||||
```
|
|
||||||
|
|
||||||
## 6. Networking and Communication
|
|
||||||
|
|
||||||
### 6.1 Ethernet Communication
|
|
||||||
|
|
||||||
**Libraries Used**:
|
|
||||||
- `Crestron.SimplSharpPro.EthernetCommunication`
|
|
||||||
- `Crestron.SimplSharp.Net.Utilities.EthernetHelper`
|
|
||||||
|
|
||||||
**Key Files**:
|
|
||||||
- `/src/PepperDash.Core/Comm/GenericTcpIpClient.cs`
|
|
||||||
- `/src/PepperDash.Core/Comm/GenericTcpIpServer.cs`
|
|
||||||
- `/src/PepperDash.Core/Comm/GenericSecureTcpIpClient.cs`
|
|
||||||
- `/src/PepperDash.Core/Comm/GenericSshClient.cs`
|
|
||||||
- `/src/PepperDash.Core/Comm/GenericUdpServer.cs`
|
|
||||||
|
|
||||||
**Usage Pattern**:
|
|
||||||
```csharp
|
|
||||||
public class GenericTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
|
|
||||||
public class GenericSecureTcpIpClient : Device, ISocketStatusWithStreamDebugging, IAutoReconnect
|
|
||||||
```
|
|
||||||
|
|
||||||
## 7. Device Management Libraries
|
|
||||||
|
|
||||||
### 7.1 DeviceSupport
|
|
||||||
|
|
||||||
**Library**: `Crestron.SimplSharpPro.DeviceSupport`
|
|
||||||
**Usage**: Core device support infrastructure used throughout the framework
|
|
||||||
|
|
||||||
### 7.2 DM (DigitalMedia)
|
|
||||||
|
|
||||||
**Library**: `Crestron.SimplSharpPro.DM`
|
|
||||||
**Usage**: Digital media routing and switching support
|
|
||||||
**Evidence**: Found in routing configuration and DM output card references
|
|
||||||
|
|
||||||
## 8. User Interface Libraries
|
|
||||||
|
|
||||||
### 8.1 UI Components
|
|
||||||
|
|
||||||
**Library**: `Crestron.SimplSharpPro.UI`
|
|
||||||
**Usage**: User interface elements and touchpanel controls
|
|
||||||
|
|
||||||
### 8.2 Smart Objects
|
|
||||||
|
|
||||||
**Key Files**:
|
|
||||||
- `/src/PepperDash.Essentials.Core/SmartObjects/SmartObjectDynamicList.cs`
|
|
||||||
- `/src/PepperDash.Essentials.Core/SmartObjects/SubpageReferenceList/SubpageReferenceList.cs`
|
|
||||||
|
|
||||||
**Usage**: Advanced UI components with dynamic content
|
|
||||||
|
|
||||||
## 9. System Monitoring and Diagnostics
|
|
||||||
|
|
||||||
### 9.1 Diagnostics
|
|
||||||
|
|
||||||
**Library**: `Crestron.SimplSharpPro.Diagnostics`
|
|
||||||
**Usage**: System health monitoring and performance tracking
|
|
||||||
|
|
||||||
### 9.2 System Information
|
|
||||||
|
|
||||||
**Key Files**:
|
|
||||||
- `/src/PepperDash.Essentials.Core/Monitoring/SystemMonitorController.cs`
|
|
||||||
|
|
||||||
**Usage**: Provides system status, Ethernet information, and program details
|
|
||||||
|
|
||||||
## 10. Integration Patterns
|
|
||||||
|
|
||||||
### 10.1 SIMPL Bridging
|
|
||||||
|
|
||||||
**Pattern**: Extensive use of `BasicTriList` for SIMPL integration
|
|
||||||
**Files**: Bridge classes throughout the framework implement `LinkToApi` methods:
|
|
||||||
```csharp
|
|
||||||
public abstract void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge);
|
|
||||||
```
|
|
||||||
|
|
||||||
### 10.2 Device Factory Pattern
|
|
||||||
|
|
||||||
**Implementation**: Factory classes create hardware-specific implementations
|
|
||||||
**Example**: `CommFactory.cs` provides communication device creation
|
|
||||||
|
|
||||||
### 10.3 Extension Methods
|
|
||||||
|
|
||||||
**Pattern**: Extensive use of extension methods for Crestron classes
|
|
||||||
**Example**: `TriListExtensions.cs` adds 30+ extension methods to `BasicTriList`
|
|
||||||
|
|
||||||
## 11. Signal Processing
|
|
||||||
|
|
||||||
### 11.1 Signal Types
|
|
||||||
|
|
||||||
**Bool Signals**: Digital control and feedback
|
|
||||||
**UShort Signals**: Analog values and numeric data
|
|
||||||
**String Signals**: Text and configuration data
|
|
||||||
|
|
||||||
**Implementation**: Comprehensive signal handling in `TriListExtensions.cs`
|
|
||||||
|
|
||||||
## 12. Error Handling and Logging
|
|
||||||
|
|
||||||
**Pattern**: Consistent use of Crestron's Debug logging throughout
|
|
||||||
**Examples**:
|
|
||||||
```csharp
|
|
||||||
Debug.LogMessage(LogEventLevel.Information, "Device {0} is not a valid device", dc.PortDeviceKey);
|
|
||||||
Debug.LogMessage(LogEventLevel.Debug, "Error Waking Panel. Maybe testing with Xpanel?");
|
|
||||||
```
|
|
||||||
|
|
||||||
## 13. Threading and Synchronization
|
|
||||||
|
|
||||||
**Components**:
|
|
||||||
- CTimer for time-based operations
|
|
||||||
- Thread-safe collections and patterns
|
|
||||||
- Event-driven programming models
|
|
||||||
|
|
||||||
## Conclusion
|
|
||||||
|
|
||||||
The PepperDash Essentials framework demonstrates sophisticated integration with the Crestron ecosystem, leveraging:
|
|
||||||
|
|
||||||
- **Core Infrastructure**: CrestronControlSystem, Device base classes
|
|
||||||
- **Communication**: COM, IR, CEC, TCP/IP, SSH protocols
|
|
||||||
- **Hardware Abstraction**: Touchpanels, I/O devices, processors
|
|
||||||
- **User Interface**: Smart objects, signal processing, SIMPL bridging
|
|
||||||
- **System Services**: Monitoring, diagnostics, device management
|
|
||||||
|
|
||||||
This analysis shows that Essentials serves as a comprehensive middleware layer, abstracting Crestron hardware complexities while providing modern software development patterns and practices.
|
|
||||||
|
|
||||||
---
|
|
||||||
*Generated: [Current Date]*
|
|
||||||
*Framework Version: PepperDash Essentials (Based on codebase analysis)*
|
|
||||||
@@ -36,6 +36,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{02EA681E-C
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Core", "src\PepperDash.Core\PepperDash.Core.csproj", "{E5336563-1194-501E-BC4A-79AD9283EF90}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PepperDash.Core", "src\PepperDash.Core\PepperDash.Core.csproj", "{E5336563-1194-501E-BC4A-79AD9283EF90}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{C8EAB8E7-4F14-4E5C-8D23-1A3956D46DE8}"
|
||||||
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PepperDash.Essentials.Core.Tests", "tests\PepperDash.Essentials.Core.Tests\PepperDash.Essentials.Core.Tests.csproj", "{A1234567-8901-2345-6789-ABCDEF012345}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug 4.7.2|Any CPU = Debug 4.7.2|Any CPU
|
Debug 4.7.2|Any CPU = Debug 4.7.2|Any CPU
|
||||||
@@ -79,6 +83,12 @@ Global
|
|||||||
{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{E5336563-1194-501E-BC4A-79AD9283EF90}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{E5336563-1194-501E-BC4A-79AD9283EF90}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{E5336563-1194-501E-BC4A-79AD9283EF90}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{E5336563-1194-501E-BC4A-79AD9283EF90}.Release|Any CPU.Build.0 = Release|Any CPU
|
{E5336563-1194-501E-BC4A-79AD9283EF90}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{A1234567-8901-2345-6789-ABCDEF012345}.Debug 4.7.2|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{A1234567-8901-2345-6789-ABCDEF012345}.Debug 4.7.2|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{A1234567-8901-2345-6789-ABCDEF012345}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{A1234567-8901-2345-6789-ABCDEF012345}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{A1234567-8901-2345-6789-ABCDEF012345}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{A1234567-8901-2345-6789-ABCDEF012345}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@@ -90,6 +100,7 @@ Global
|
|||||||
{F6D362DE-2256-44B1-927A-8CE4705D839A} = {B24989D7-32B5-48D5-9AE1-5F3B17D25206}
|
{F6D362DE-2256-44B1-927A-8CE4705D839A} = {B24989D7-32B5-48D5-9AE1-5F3B17D25206}
|
||||||
{B438694F-8FF7-464A-9EC8-10427374471F} = {B24989D7-32B5-48D5-9AE1-5F3B17D25206}
|
{B438694F-8FF7-464A-9EC8-10427374471F} = {B24989D7-32B5-48D5-9AE1-5F3B17D25206}
|
||||||
{E5336563-1194-501E-BC4A-79AD9283EF90} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
|
{E5336563-1194-501E-BC4A-79AD9283EF90} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
|
||||||
|
{A1234567-8901-2345-6789-ABCDEF012345} = {C8EAB8E7-4F14-4E5C-8D23-1A3956D46DE8}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {6907A4BF-7201-47CF-AAB1-3597F3B8E1C3}
|
SolutionGuid = {6907A4BF-7201-47CF-AAB1-3597F3B8E1C3}
|
||||||
|
|||||||
188
docs/testing/QuickStart.md
Normal file
188
docs/testing/QuickStart.md
Normal file
@@ -0,0 +1,188 @@
|
|||||||
|
# Quick Start Guide: Unit Testing
|
||||||
|
|
||||||
|
This guide helps you get started with writing unit tests for PepperDash Essentials components.
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
- .NET 8 SDK
|
||||||
|
- Visual Studio 2022 or VS Code with C# extension
|
||||||
|
|
||||||
|
## Running Existing Tests
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Navigate to the test project
|
||||||
|
cd tests/PepperDash.Essentials.Core.Tests
|
||||||
|
|
||||||
|
# Run all tests
|
||||||
|
dotnet test
|
||||||
|
|
||||||
|
# Run with coverage
|
||||||
|
dotnet test --collect:"XPlat Code Coverage"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Creating Your First Test
|
||||||
|
|
||||||
|
### 1. Identify the Component
|
||||||
|
|
||||||
|
Choose a component that has business logic you want to test. Look for classes that:
|
||||||
|
- Have clear inputs and outputs
|
||||||
|
- Contain conditional logic or algorithms
|
||||||
|
- Are used by multiple parts of the system
|
||||||
|
|
||||||
|
### 2. Create Test File
|
||||||
|
|
||||||
|
Create a new test file in `tests/PepperDash.Essentials.Core.Tests/Unit/`:
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
using PepperDash.Essentials.Core.Tests.Abstractions;
|
||||||
|
|
||||||
|
namespace PepperDash.Essentials.Core.Tests.Unit
|
||||||
|
{
|
||||||
|
public class YourComponentTests
|
||||||
|
{
|
||||||
|
[Fact]
|
||||||
|
public void YourMethod_WithValidInput_ReturnsExpectedResult()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var component = new YourComponent();
|
||||||
|
var input = "test data";
|
||||||
|
|
||||||
|
// Act
|
||||||
|
var result = component.YourMethod(input);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
Assert.Equal("expected result", result);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. Abstract Dependencies
|
||||||
|
|
||||||
|
If your component uses Crestron SDK or other external dependencies:
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
// Create interface in Abstractions/
|
||||||
|
public interface IYourDependency
|
||||||
|
{
|
||||||
|
string DoSomething(string input);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Modify your component to use the interface
|
||||||
|
public class YourComponent
|
||||||
|
{
|
||||||
|
private readonly IYourDependency _dependency;
|
||||||
|
|
||||||
|
public YourComponent(IYourDependency dependency)
|
||||||
|
{
|
||||||
|
_dependency = dependency;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string YourMethod(string input)
|
||||||
|
{
|
||||||
|
return _dependency.DoSomething(input);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test with mocks
|
||||||
|
[Fact]
|
||||||
|
public void YourMethod_CallsDependency_ReturnsResult()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var mockDependency = new Mock<IYourDependency>();
|
||||||
|
mockDependency.Setup(x => x.DoSomething("input")).Returns("output");
|
||||||
|
var component = new YourComponent(mockDependency.Object);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
var result = component.YourMethod("input");
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
Assert.Equal("output", result);
|
||||||
|
mockDependency.Verify(x => x.DoSomething("input"), Times.Once);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Testing Patterns
|
||||||
|
|
||||||
|
### Testing Exceptions
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
[Fact]
|
||||||
|
public void Constructor_WithNullDependency_ThrowsArgumentNullException()
|
||||||
|
{
|
||||||
|
// Act & Assert
|
||||||
|
Assert.Throws<ArgumentNullException>(() => new YourComponent(null));
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Testing Async Methods
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
[Fact]
|
||||||
|
public async Task YourAsyncMethod_WithValidInput_ReturnsExpectedResult()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var component = new YourComponent();
|
||||||
|
|
||||||
|
// Act
|
||||||
|
var result = await component.YourAsyncMethod();
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
Assert.True(result);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Testing Collections
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
[Fact]
|
||||||
|
public void GetItems_ReturnsExpectedCount()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
var component = new YourComponent();
|
||||||
|
|
||||||
|
// Act
|
||||||
|
var items = component.GetItems();
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
Assert.Equal(3, items.Count());
|
||||||
|
Assert.Contains(items, x => x.Name == "Expected Item");
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Common Mistakes to Avoid
|
||||||
|
|
||||||
|
1. **Testing Implementation Details** - Test behavior, not internal implementation
|
||||||
|
2. **Overly Complex Tests** - Keep tests simple and focused on one thing
|
||||||
|
3. **Not Testing Edge Cases** - Include null values, empty collections, boundary conditions
|
||||||
|
4. **Ignoring Test Performance** - Tests should run quickly to enable fast feedback
|
||||||
|
|
||||||
|
## Debugging Tests
|
||||||
|
|
||||||
|
### In Visual Studio
|
||||||
|
- Set breakpoints in test methods
|
||||||
|
- Use Test Explorer to run individual tests
|
||||||
|
- Check test output window for detailed information
|
||||||
|
|
||||||
|
### From Command Line
|
||||||
|
```bash
|
||||||
|
# Run specific test
|
||||||
|
dotnet test --filter "YourComponentTests.YourMethod_WithValidInput_ReturnsExpectedResult"
|
||||||
|
|
||||||
|
# Run with detailed output
|
||||||
|
dotnet test --verbosity diagnostic
|
||||||
|
```
|
||||||
|
|
||||||
|
## Next Steps
|
||||||
|
|
||||||
|
1. **Review Examples** - Look at `TestableActionSequenceTests.cs` for comprehensive examples
|
||||||
|
2. **Start Small** - Begin with simple components and build up complexity
|
||||||
|
3. **Read Documentation** - Check `docs/testing/README.md` for detailed patterns
|
||||||
|
4. **Get Feedback** - Have your tests reviewed by team members
|
||||||
|
|
||||||
|
## Need Help?
|
||||||
|
|
||||||
|
- Check existing test examples in the codebase
|
||||||
|
- Review the full testing documentation
|
||||||
|
- Ask team members for guidance on complex scenarios
|
||||||
|
- Consider pair programming for your first few tests
|
||||||
255
docs/testing/README.md
Normal file
255
docs/testing/README.md
Normal file
@@ -0,0 +1,255 @@
|
|||||||
|
# Unit Testing Infrastructure
|
||||||
|
|
||||||
|
This document outlines the unit testing infrastructure and patterns for PepperDash Essentials.
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
The testing infrastructure is designed to enable comprehensive testing of business logic while abstracting away Crestron SDK dependencies. This allows for:
|
||||||
|
|
||||||
|
- Fast, reliable unit tests that don't require hardware
|
||||||
|
- Isolated testing of business logic
|
||||||
|
- Better code quality through testability
|
||||||
|
- Easier debugging and maintenance
|
||||||
|
|
||||||
|
## Project Structure
|
||||||
|
|
||||||
|
```
|
||||||
|
tests/
|
||||||
|
├── PepperDash.Essentials.Core.Tests/
|
||||||
|
│ ├── Abstractions/ # Interface abstractions for SDK dependencies
|
||||||
|
│ ├── TestableComponents/ # Demonstration components showing abstraction patterns
|
||||||
|
│ ├── Unit/ # Unit test files
|
||||||
|
│ └── GlobalUsings.cs # Global using statements for tests
|
||||||
|
```
|
||||||
|
|
||||||
|
## Test Project Configuration
|
||||||
|
|
||||||
|
The test projects use:
|
||||||
|
- **.NET 8** - Modern testing framework with better performance
|
||||||
|
- **xUnit** - Primary testing framework
|
||||||
|
- **Moq** - Mocking framework for dependencies
|
||||||
|
- **Coverlet** - Code coverage analysis
|
||||||
|
|
||||||
|
## Abstraction Patterns
|
||||||
|
|
||||||
|
### Interface Segregation
|
||||||
|
|
||||||
|
Create focused interfaces that abstract SDK functionality:
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
public interface IThreadService
|
||||||
|
{
|
||||||
|
void Sleep(int milliseconds);
|
||||||
|
object CreateAndStartThread(Func<object, object> threadFunction, object parameter);
|
||||||
|
void AbortThread(object thread);
|
||||||
|
bool IsThreadRunning(object thread);
|
||||||
|
}
|
||||||
|
|
||||||
|
public interface ILogger
|
||||||
|
{
|
||||||
|
void LogDebug(object source, string message, params object[] args);
|
||||||
|
void LogVerbose(object source, string message, params object[] args);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Dependency Injection
|
||||||
|
|
||||||
|
Components should accept dependencies via constructor injection:
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
public class TestableActionSequence
|
||||||
|
{
|
||||||
|
private readonly IQueue<TestableSequencedAction> _actionQueue;
|
||||||
|
private readonly IThreadService _threadService;
|
||||||
|
private readonly ILogger _logger;
|
||||||
|
|
||||||
|
public TestableActionSequence(
|
||||||
|
IQueue<TestableSequencedAction> actionQueue,
|
||||||
|
IThreadService threadService,
|
||||||
|
ILogger logger,
|
||||||
|
List<TestableSequencedAction> actions)
|
||||||
|
{
|
||||||
|
_actionQueue = actionQueue ?? throw new ArgumentNullException(nameof(actionQueue));
|
||||||
|
_threadService = threadService ?? throw new ArgumentNullException(nameof(threadService));
|
||||||
|
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
|
||||||
|
// ...
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Writing Tests
|
||||||
|
|
||||||
|
### Test Organization
|
||||||
|
|
||||||
|
- **One test class per component**
|
||||||
|
- **Descriptive test method names** that describe the scenario and expected outcome
|
||||||
|
- **Arrange-Act-Assert pattern** for clear test structure
|
||||||
|
|
||||||
|
### Example Test Structure
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
public class TestableActionSequenceTests
|
||||||
|
{
|
||||||
|
private readonly Mock<IQueue<TestableSequencedAction>> _mockQueue;
|
||||||
|
private readonly Mock<IThreadService> _mockThreadService;
|
||||||
|
private readonly Mock<ILogger> _mockLogger;
|
||||||
|
private readonly TestableActionSequence _actionSequence;
|
||||||
|
|
||||||
|
public TestableActionSequenceTests()
|
||||||
|
{
|
||||||
|
// Arrange - Set up mocks and dependencies
|
||||||
|
_mockQueue = new Mock<IQueue<TestableSequencedAction>>();
|
||||||
|
_mockThreadService = new Mock<IThreadService>();
|
||||||
|
_mockLogger = new Mock<ILogger>();
|
||||||
|
|
||||||
|
_actionSequence = new TestableActionSequence(
|
||||||
|
_mockQueue.Object,
|
||||||
|
_mockThreadService.Object,
|
||||||
|
_mockLogger.Object,
|
||||||
|
new List<TestableSequencedAction>());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public void StartSequence_WhenNoThreadRunning_StartsNewThread()
|
||||||
|
{
|
||||||
|
// Arrange
|
||||||
|
_mockThreadService.Setup(x => x.IsThreadRunning(It.IsAny<object>())).Returns(false);
|
||||||
|
|
||||||
|
// Act
|
||||||
|
_actionSequence.StartSequence();
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
_mockLogger.Verify(x => x.LogDebug(_actionSequence, "Starting Action Sequence"), Times.Once);
|
||||||
|
_mockThreadService.Verify(x => x.CreateAndStartThread(It.IsAny<Func<object, object>>(), null), Times.Once);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Test Naming Convention
|
||||||
|
|
||||||
|
Use descriptive names that follow the pattern:
|
||||||
|
`MethodName_Scenario_ExpectedBehavior`
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
- `StartSequence_WhenNoThreadRunning_StartsNewThread`
|
||||||
|
- `Constructor_WithNullQueue_ThrowsArgumentNullException`
|
||||||
|
- `StopSequence_SetsAllowActionsToFalseAndAbortsThread`
|
||||||
|
|
||||||
|
## Running Tests
|
||||||
|
|
||||||
|
### From Command Line
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Run all tests
|
||||||
|
dotnet test
|
||||||
|
|
||||||
|
# Run tests with coverage
|
||||||
|
dotnet test --collect:"XPlat Code Coverage"
|
||||||
|
|
||||||
|
# Run specific test class
|
||||||
|
dotnet test --filter "TestableActionSequenceTests"
|
||||||
|
|
||||||
|
# Run with verbose output
|
||||||
|
dotnet test --verbosity normal
|
||||||
|
```
|
||||||
|
|
||||||
|
### From Visual Studio
|
||||||
|
|
||||||
|
- Use Test Explorer to run and debug tests
|
||||||
|
- Right-click on test methods to run individually
|
||||||
|
- Use "Run Tests in Parallel" for faster execution
|
||||||
|
|
||||||
|
## Code Coverage
|
||||||
|
|
||||||
|
The test projects include Coverlet for code coverage analysis. After running tests with coverage:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Generate coverage report
|
||||||
|
dotnet tool install -g reportgenerator
|
||||||
|
reportgenerator -reports:"coverage.cobertura.xml" -targetdir:"coverage-report" -reporttypes:Html
|
||||||
|
```
|
||||||
|
|
||||||
|
## Best Practices
|
||||||
|
|
||||||
|
### 1. Test Independence
|
||||||
|
- Each test should be independent and able to run in isolation
|
||||||
|
- Use fresh mock objects for each test
|
||||||
|
- Don't rely on test execution order
|
||||||
|
|
||||||
|
### 2. Mocking Guidelines
|
||||||
|
- Mock external dependencies (SDK calls, file system, network)
|
||||||
|
- Don't mock the component under test
|
||||||
|
- Use strict mocks when behavior verification is important
|
||||||
|
|
||||||
|
### 3. Assertions
|
||||||
|
- Make assertions specific and meaningful
|
||||||
|
- Test both positive and negative scenarios
|
||||||
|
- Verify state changes and behavior calls
|
||||||
|
|
||||||
|
### 4. Test Data
|
||||||
|
- Use meaningful test data that represents real scenarios
|
||||||
|
- Consider edge cases and boundary conditions
|
||||||
|
- Use constants or factory methods for complex test data
|
||||||
|
|
||||||
|
## Migrating Existing Code
|
||||||
|
|
||||||
|
To make existing components testable:
|
||||||
|
|
||||||
|
1. **Identify SDK Dependencies** - Look for direct Crestron SDK usage
|
||||||
|
2. **Extract Interfaces** - Create abstractions for SDK functionality
|
||||||
|
3. **Inject Dependencies** - Modify constructors to accept abstractions
|
||||||
|
4. **Create Tests** - Write comprehensive unit tests for business logic
|
||||||
|
5. **Implement Wrappers** - Create concrete implementations for production use
|
||||||
|
|
||||||
|
## Example Implementation Wrapper
|
||||||
|
|
||||||
|
When implementing the abstractions for production use:
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
public class CrestronThreadService : IThreadService
|
||||||
|
{
|
||||||
|
public void Sleep(int milliseconds)
|
||||||
|
{
|
||||||
|
Thread.Sleep(milliseconds);
|
||||||
|
}
|
||||||
|
|
||||||
|
public object CreateAndStartThread(Func<object, object> threadFunction, object parameter)
|
||||||
|
{
|
||||||
|
var thread = new Thread(threadFunction, parameter, Thread.eThreadStartOptions.Running);
|
||||||
|
return thread;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AbortThread(object thread)
|
||||||
|
{
|
||||||
|
if (thread is Thread crestronThread)
|
||||||
|
{
|
||||||
|
crestronThread.Abort();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsThreadRunning(object thread)
|
||||||
|
{
|
||||||
|
return thread is Thread crestronThread &&
|
||||||
|
crestronThread.ThreadState == Thread.eThreadStates.ThreadRunning;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
## Future Enhancements
|
||||||
|
|
||||||
|
The testing infrastructure can be extended with:
|
||||||
|
|
||||||
|
- **Integration test support** for end-to-end scenarios
|
||||||
|
- **Performance testing** utilities
|
||||||
|
- **Test data builders** for complex object creation
|
||||||
|
- **Custom assertions** for domain-specific validations
|
||||||
|
- **Automated test generation** for common patterns
|
||||||
|
|
||||||
|
## Getting Help
|
||||||
|
|
||||||
|
For questions about testing patterns or infrastructure:
|
||||||
|
|
||||||
|
1. Review existing test examples in the `tests/` directory
|
||||||
|
2. Check this documentation for guidance
|
||||||
|
3. Consult the team for complex abstraction scenarios
|
||||||
|
4. Consider the impact on existing plugin interfaces before major changes
|
||||||
@@ -84,9 +84,10 @@ namespace PepperDash.Core
|
|||||||
port.TextReceived += Port_TextReceivedStringDelimiter;
|
port.TextReceived += Port_TextReceivedStringDelimiter;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Stop method
|
/// Disconnects this gather from the Port's TextReceived event. This will not fire LineReceived
|
||||||
/// </summary>
|
/// after the this call.
|
||||||
|
/// </summary>
|
||||||
public void Stop()
|
public void Stop()
|
||||||
{
|
{
|
||||||
Port.TextReceived -= Port_TextReceived;
|
Port.TextReceived -= Port_TextReceived;
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ namespace PepperDash.Core
|
|||||||
private CTimer DebugExpiryPeriod;
|
private CTimer DebugExpiryPeriod;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the DebugSetting
|
/// The current debug setting
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public eStreamDebuggingSetting DebugSetting { get; private set; }
|
public eStreamDebuggingSetting DebugSetting { get; private set; }
|
||||||
|
|
||||||
@@ -42,7 +42,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the RxStreamDebuggingIsEnabled
|
/// Indicates that receive stream debugging is enabled
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool RxStreamDebuggingIsEnabled{ get; private set; }
|
public bool RxStreamDebuggingIsEnabled{ get; private set; }
|
||||||
|
|
||||||
@@ -65,9 +65,6 @@ namespace PepperDash.Core
|
|||||||
/// Sets the debugging setting and if not setting to off, assumes the default of 30 mintues
|
/// Sets the debugging setting and if not setting to off, assumes the default of 30 mintues
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="setting"></param>
|
/// <param name="setting"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetDebuggingWithDefaultTimeout method
|
|
||||||
/// </summary>
|
|
||||||
public void SetDebuggingWithDefaultTimeout(eStreamDebuggingSetting setting)
|
public void SetDebuggingWithDefaultTimeout(eStreamDebuggingSetting setting)
|
||||||
{
|
{
|
||||||
if (setting == eStreamDebuggingSetting.Off)
|
if (setting == eStreamDebuggingSetting.Off)
|
||||||
@@ -84,9 +81,6 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="setting"></param>
|
/// <param name="setting"></param>
|
||||||
/// <param name="minutes"></param>
|
/// <param name="minutes"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetDebuggingWithSpecificTimeout method
|
|
||||||
/// </summary>
|
|
||||||
public void SetDebuggingWithSpecificTimeout(eStreamDebuggingSetting setting, uint minutes)
|
public void SetDebuggingWithSpecificTimeout(eStreamDebuggingSetting setting, uint minutes)
|
||||||
{
|
{
|
||||||
if (setting == eStreamDebuggingSetting.Off)
|
if (setting == eStreamDebuggingSetting.Off)
|
||||||
@@ -141,9 +135,6 @@ namespace PepperDash.Core
|
|||||||
/// The available settings for stream debugging
|
/// The available settings for stream debugging
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Flags]
|
[Flags]
|
||||||
/// <summary>
|
|
||||||
/// Enumeration of eStreamDebuggingSetting values
|
|
||||||
/// </summary>
|
|
||||||
public enum eStreamDebuggingSetting
|
public enum eStreamDebuggingSetting
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ using Newtonsoft.Json.Converters;
|
|||||||
namespace PepperDash.Core
|
namespace PepperDash.Core
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a ControlPropertiesConfig
|
/// Config properties that indicate how to communicate with a device for control
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ControlPropertiesConfig
|
public class ControlPropertiesConfig
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class GenericSocketStatusChageEventArgs : EventArgs
|
public class GenericSocketStatusChageEventArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Client
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ISocketStatus Client { get; private set; }
|
public ISocketStatus Client { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -60,7 +60,7 @@ namespace PepperDash.Core
|
|||||||
public class GenericTcpServerStateChangedEventArgs : EventArgs
|
public class GenericTcpServerStateChangedEventArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the State
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ServerState State { get; private set; }
|
public ServerState State { get; private set; }
|
||||||
|
|
||||||
@@ -154,7 +154,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Text
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Text { get; private set; }
|
public string Text { get; private set; }
|
||||||
|
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Port
|
/// Port on server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Port { get; set; }
|
public int Port { get; set; }
|
||||||
|
|
||||||
@@ -149,7 +149,7 @@ namespace PepperDash.Core
|
|||||||
public string ConnectionFailure { get { return ClientStatus.ToString(); } }
|
public string ConnectionFailure { get { return ClientStatus.ToString(); } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the AutoReconnect
|
/// bool to track if auto reconnect should be set on the socket
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool AutoReconnect { get; set; }
|
public bool AutoReconnect { get; set; }
|
||||||
|
|
||||||
@@ -188,7 +188,7 @@ namespace PepperDash.Core
|
|||||||
#region GenericSecureTcpIpClient properties
|
#region GenericSecureTcpIpClient properties
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the SharedKeyRequired
|
/// Bool to show whether the server requires a preshared key. This is used in the DynamicTCPServer class
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool SharedKeyRequired { get; set; }
|
public bool SharedKeyRequired { get; set; }
|
||||||
|
|
||||||
@@ -207,7 +207,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the SharedKey
|
/// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string SharedKey { get; set; }
|
public string SharedKey { get; set; }
|
||||||
|
|
||||||
@@ -222,7 +222,7 @@ namespace PepperDash.Core
|
|||||||
bool IsTryingToConnect;
|
bool IsTryingToConnect;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the IsReadyForCommunication
|
/// Bool showing if socket is ready for communication after shared key exchange
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsReadyForCommunication { get; set; }
|
public bool IsReadyForCommunication { get; set; }
|
||||||
|
|
||||||
@@ -342,7 +342,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initialize method
|
/// Just to help S+ set the key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Initialize(string key)
|
public void Initialize(string key)
|
||||||
{
|
{
|
||||||
@@ -421,9 +421,6 @@ namespace PepperDash.Core
|
|||||||
/// Deactivate the client
|
/// Deactivate the client
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// Deactivate method
|
|
||||||
/// </summary>
|
|
||||||
public override bool Deactivate()
|
public override bool Deactivate()
|
||||||
{
|
{
|
||||||
if (_client != null)
|
if (_client != null)
|
||||||
@@ -435,7 +432,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Connect method
|
/// Connect Method. Will return if already connected. Will write errors if missing address, port, or unique key/name.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Connect()
|
public void Connect()
|
||||||
{
|
{
|
||||||
@@ -566,7 +563,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Disconnect method
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Disconnect()
|
public void Disconnect()
|
||||||
{
|
{
|
||||||
@@ -589,7 +586,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// DisconnectClient method
|
/// Does the actual disconnect business
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void DisconnectClient()
|
public void DisconnectClient()
|
||||||
{
|
{
|
||||||
@@ -849,7 +846,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SendText method
|
/// General send method
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void SendText(string text)
|
public void SendText(string text)
|
||||||
{
|
{
|
||||||
@@ -878,7 +875,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SendBytes method
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void SendBytes(byte[] bytes)
|
public void SendBytes(byte[] bytes)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ namespace PepperDash.Core
|
|||||||
public string Hostname { get; set; }
|
public string Hostname { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Port
|
/// Port on server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Port { get; set; }
|
public int Port { get; set; }
|
||||||
|
|
||||||
@@ -113,7 +113,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the SharedKey
|
/// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string SharedKey { get; set; }
|
public string SharedKey { get; set; }
|
||||||
|
|
||||||
@@ -123,7 +123,7 @@ namespace PepperDash.Core
|
|||||||
private bool WaitingForSharedKeyResponse { get; set; }
|
private bool WaitingForSharedKeyResponse { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the BufferSize
|
/// Defaults to 2000
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int BufferSize { get; set; }
|
public int BufferSize { get; set; }
|
||||||
|
|
||||||
@@ -336,7 +336,7 @@ namespace PepperDash.Core
|
|||||||
#region Methods
|
#region Methods
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initialize method
|
/// Just to help S+ set the key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Initialize(string key)
|
public void Initialize(string key)
|
||||||
{
|
{
|
||||||
@@ -395,7 +395,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Connect method
|
/// Connect Method. Will return if already connected. Will write errors if missing address, port, or unique key/name.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Connect()
|
public void Connect()
|
||||||
{
|
{
|
||||||
@@ -526,7 +526,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Disconnect method
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Disconnect()
|
public void Disconnect()
|
||||||
{
|
{
|
||||||
@@ -804,7 +804,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SendText method
|
/// General send method
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void SendText(string text)
|
public void SendText(string text)
|
||||||
{
|
{
|
||||||
@@ -833,7 +833,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SendBytes method
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void SendBytes(byte[] bytes)
|
public void SendBytes(byte[] bytes)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ namespace PepperDash.Core
|
|||||||
public ServerHasChokedCallbackDelegate ServerHasChoked { get; set; }
|
public ServerHasChokedCallbackDelegate ServerHasChoked { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Delegate for ServerHasChokedCallbackDelegate
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public delegate void ServerHasChokedCallbackDelegate();
|
public delegate void ServerHasChokedCallbackDelegate();
|
||||||
|
|
||||||
@@ -104,7 +104,7 @@ namespace PepperDash.Core
|
|||||||
int MonitorClientFailureCount;
|
int MonitorClientFailureCount;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the MonitorClientMaxFailureCount
|
/// 3 by default
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int MonitorClientMaxFailureCount { get; set; }
|
public int MonitorClientMaxFailureCount { get; set; }
|
||||||
|
|
||||||
@@ -190,7 +190,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Port
|
/// Port Server should listen on
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Port { get; set; }
|
public int Port { get; set; }
|
||||||
|
|
||||||
@@ -223,7 +223,8 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the SharedKey
|
/// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module.
|
||||||
|
/// If SharedKey changes while server is listening or clients are connected, disconnect and stop listening will be called
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string SharedKey { get; set; }
|
public string SharedKey { get; set; }
|
||||||
|
|
||||||
@@ -247,7 +248,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the HeartbeatRequiredIntervalMs
|
/// Milliseconds before server expects another heartbeat. Set by property HeartbeatRequiredIntervalInSeconds which is driven from S+
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int HeartbeatRequiredIntervalMs { get; set; }
|
public int HeartbeatRequiredIntervalMs { get; set; }
|
||||||
|
|
||||||
@@ -257,7 +258,7 @@ namespace PepperDash.Core
|
|||||||
public ushort HeartbeatRequiredIntervalInSeconds { set { HeartbeatRequiredIntervalMs = (value * 1000); } }
|
public ushort HeartbeatRequiredIntervalInSeconds { set { HeartbeatRequiredIntervalMs = (value * 1000); } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the HeartbeatStringToMatch
|
/// String to Match for heartbeat. If null or empty any string will reset heartbeat timer
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string HeartbeatStringToMatch { get; set; }
|
public string HeartbeatStringToMatch { get; set; }
|
||||||
|
|
||||||
@@ -275,7 +276,7 @@ namespace PepperDash.Core
|
|||||||
public List<uint> ConnectedClientsIndexes = new List<uint>();
|
public List<uint> ConnectedClientsIndexes = new List<uint>();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the BufferSize
|
/// Defaults to 2000
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int BufferSize { get; set; }
|
public int BufferSize { get; set; }
|
||||||
|
|
||||||
@@ -338,7 +339,7 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
#region Methods - Server Actions
|
#region Methods - Server Actions
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// KillServer method
|
/// Disconnects all clients and stops the server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void KillServer()
|
public void KillServer()
|
||||||
{
|
{
|
||||||
@@ -355,9 +356,6 @@ namespace PepperDash.Core
|
|||||||
/// Initialize Key for device using client name from SIMPL+. Called on Listen from SIMPL+
|
/// Initialize Key for device using client name from SIMPL+. Called on Listen from SIMPL+
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <summary>
|
|
||||||
/// Initialize method
|
|
||||||
/// </summary>
|
|
||||||
public void Initialize(string key)
|
public void Initialize(string key)
|
||||||
{
|
{
|
||||||
Key = key;
|
Key = key;
|
||||||
@@ -397,7 +395,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Listen method
|
/// Start listening on the specified port
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Listen()
|
public void Listen()
|
||||||
{
|
{
|
||||||
@@ -455,7 +453,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// StopListening method
|
/// Stop Listeneing
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void StopListening()
|
public void StopListening()
|
||||||
{
|
{
|
||||||
@@ -480,9 +478,6 @@ namespace PepperDash.Core
|
|||||||
/// Disconnects Client
|
/// Disconnects Client
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="client"></param>
|
/// <param name="client"></param>
|
||||||
/// <summary>
|
|
||||||
/// DisconnectClient method
|
|
||||||
/// </summary>
|
|
||||||
public void DisconnectClient(uint client)
|
public void DisconnectClient(uint client)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -496,7 +491,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// DisconnectAllClientsForShutdown method
|
/// Disconnect All Clients
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void DisconnectAllClientsForShutdown()
|
public void DisconnectAllClientsForShutdown()
|
||||||
{
|
{
|
||||||
@@ -538,9 +533,6 @@ namespace PepperDash.Core
|
|||||||
/// Broadcast text from server to all connected clients
|
/// Broadcast text from server to all connected clients
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="text"></param>
|
/// <param name="text"></param>
|
||||||
/// <summary>
|
|
||||||
/// BroadcastText method
|
|
||||||
/// </summary>
|
|
||||||
public void BroadcastText(string text)
|
public void BroadcastText(string text)
|
||||||
{
|
{
|
||||||
CCriticalSection CCBroadcast = new CCriticalSection();
|
CCriticalSection CCBroadcast = new CCriticalSection();
|
||||||
@@ -574,9 +566,6 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="text"></param>
|
/// <param name="text"></param>
|
||||||
/// <param name="clientIndex"></param>
|
/// <param name="clientIndex"></param>
|
||||||
/// <summary>
|
|
||||||
/// SendTextToClient method
|
|
||||||
/// </summary>
|
|
||||||
public void SendTextToClient(string text, uint clientIndex)
|
public void SendTextToClient(string text, uint clientIndex)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -645,9 +634,6 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="clientIndex"></param>
|
/// <param name="clientIndex"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// GetClientIPAddress method
|
|
||||||
/// </summary>
|
|
||||||
public string GetClientIPAddress(uint clientIndex)
|
public string GetClientIPAddress(uint clientIndex)
|
||||||
{
|
{
|
||||||
Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "GetClientIPAddress Index: {0}", clientIndex);
|
Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "GetClientIPAddress Index: {0}", clientIndex);
|
||||||
|
|||||||
@@ -36,13 +36,13 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
|
public event EventHandler<GenericSocketStatusChageEventArgs> ConnectionChange;
|
||||||
|
|
||||||
/// <summary>
|
///// <summary>
|
||||||
/////
|
/////
|
||||||
///// </summary>
|
///// </summary>
|
||||||
//public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
|
//public event GenericSocketStatusChangeEventDelegate SocketStatusChange;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Hostname
|
/// Address of server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Hostname { get; set; }
|
public string Hostname { get; set; }
|
||||||
|
|
||||||
@@ -52,12 +52,12 @@ namespace PepperDash.Core
|
|||||||
public int Port { get; set; }
|
public int Port { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Username
|
/// Username for server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Username { get; set; }
|
public string Username { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Password
|
/// And... Password for server. That was worth documenting!
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Password { get; set; }
|
public string Password { get; set; }
|
||||||
|
|
||||||
@@ -79,7 +79,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Socket status change event
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public SocketStatus ClientStatus
|
public SocketStatus ClientStatus
|
||||||
{
|
{
|
||||||
@@ -123,7 +123,8 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the AutoReconnectIntervalMs
|
/// Millisecond value, determines the timeout period in between reconnect attempts.
|
||||||
|
/// Set to 5000 by default
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int AutoReconnectIntervalMs { get; set; }
|
public int AutoReconnectIntervalMs { get; set; }
|
||||||
|
|
||||||
@@ -146,31 +147,31 @@ namespace PepperDash.Core
|
|||||||
base(key)
|
base(key)
|
||||||
{
|
{
|
||||||
StreamDebugging = new CommunicationStreamDebugging(key);
|
StreamDebugging = new CommunicationStreamDebugging(key);
|
||||||
CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
|
CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
|
||||||
Key = key;
|
Key = key;
|
||||||
Hostname = hostname;
|
Hostname = hostname;
|
||||||
Port = port;
|
Port = port;
|
||||||
Username = username;
|
Username = username;
|
||||||
Password = password;
|
Password = password;
|
||||||
AutoReconnectIntervalMs = 5000;
|
AutoReconnectIntervalMs = 5000;
|
||||||
|
|
||||||
ReconnectTimer = new CTimer(o =>
|
ReconnectTimer = new CTimer(o =>
|
||||||
{
|
{
|
||||||
if (ConnectEnabled)
|
if (ConnectEnabled)
|
||||||
{
|
{
|
||||||
Connect();
|
Connect();
|
||||||
}
|
}
|
||||||
}, System.Threading.Timeout.Infinite);
|
}, System.Threading.Timeout.Infinite);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// S+ Constructor - Must set all properties before calling Connect
|
/// S+ Constructor - Must set all properties before calling Connect
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public GenericSshClient()
|
public GenericSshClient()
|
||||||
: base(SPlusKey)
|
: base(SPlusKey)
|
||||||
{
|
{
|
||||||
CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
|
CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler);
|
||||||
AutoReconnectIntervalMs = 5000;
|
AutoReconnectIntervalMs = 5000;
|
||||||
|
|
||||||
ReconnectTimer = new CTimer(o =>
|
ReconnectTimer = new CTimer(o =>
|
||||||
{
|
{
|
||||||
@@ -179,25 +180,25 @@ namespace PepperDash.Core
|
|||||||
Connect();
|
Connect();
|
||||||
}
|
}
|
||||||
}, System.Threading.Timeout.Infinite);
|
}, System.Threading.Timeout.Infinite);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Handles closing this up when the program shuts down
|
/// Handles closing this up when the program shuts down
|
||||||
/// </summary>
|
/// </summary>
|
||||||
void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
|
void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType)
|
||||||
{
|
{
|
||||||
if (programEventType == eProgramStatusEventType.Stopping)
|
if (programEventType == eProgramStatusEventType.Stopping)
|
||||||
{
|
{
|
||||||
if (Client != null)
|
if (Client != null)
|
||||||
{
|
{
|
||||||
this.LogDebug("Program stopping. Closing connection");
|
this.LogDebug("Program stopping. Closing connection");
|
||||||
Disconnect();
|
Disconnect();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Connect method
|
/// Connect to the server, using the provided properties.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Connect()
|
public void Connect()
|
||||||
{
|
{
|
||||||
@@ -223,7 +224,10 @@ namespace PepperDash.Core
|
|||||||
this.LogDebug("Attempting connect");
|
this.LogDebug("Attempting connect");
|
||||||
|
|
||||||
// Cancel reconnect if running.
|
// Cancel reconnect if running.
|
||||||
ReconnectTimer?.Stop();
|
if (ReconnectTimer != null)
|
||||||
|
{
|
||||||
|
ReconnectTimer.Stop();
|
||||||
|
}
|
||||||
|
|
||||||
// Cleanup the old client if it already exists
|
// Cleanup the old client if it already exists
|
||||||
if (Client != null)
|
if (Client != null)
|
||||||
@@ -265,26 +269,20 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
if (ie is SocketException)
|
if (ie is SocketException)
|
||||||
{
|
{
|
||||||
this.LogError("CONNECTION failure: Cannot reach host");
|
this.LogException(ie, "CONNECTION failure: Cannot reach host");
|
||||||
this.LogVerbose(ie, "Exception details: ");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ie is System.Net.Sockets.SocketException socketException)
|
if (ie is System.Net.Sockets.SocketException socketException)
|
||||||
{
|
{
|
||||||
this.LogError("Connection failure: Cannot reach {host} on {port}",
|
this.LogException(ie, "Connection failure: Cannot reach {host} on {port}",
|
||||||
Hostname, Port);
|
Hostname, Port);
|
||||||
this.LogVerbose(socketException, "SocketException details: ");
|
|
||||||
}
|
}
|
||||||
if (ie is SshAuthenticationException)
|
if (ie is SshAuthenticationException)
|
||||||
{
|
{
|
||||||
this.LogError("Authentication failure for username {userName}", Username);
|
this.LogException(ie, "Authentication failure for username {userName}", Username);
|
||||||
this.LogVerbose(ie, "AuthenticationException details: ");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
this.LogException(ie, "Error on connect");
|
||||||
this.LogError("Error on connect: {error}", ie.Message);
|
|
||||||
this.LogVerbose(ie, "Exception details: ");
|
|
||||||
}
|
|
||||||
|
|
||||||
DisconnectLogged = true;
|
DisconnectLogged = true;
|
||||||
KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
|
KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
|
||||||
@@ -294,7 +292,7 @@ namespace PepperDash.Core
|
|||||||
ReconnectTimer.Reset(AutoReconnectIntervalMs);
|
ReconnectTimer.Reset(AutoReconnectIntervalMs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (SshOperationTimeoutException ex)
|
catch(SshOperationTimeoutException ex)
|
||||||
{
|
{
|
||||||
this.LogWarning("Connection attempt timed out: {message}", ex.Message);
|
this.LogWarning("Connection attempt timed out: {message}", ex.Message);
|
||||||
|
|
||||||
@@ -309,8 +307,7 @@ namespace PepperDash.Core
|
|||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
|
var errorLogLevel = DisconnectLogged == true ? Debug.ErrorLogLevel.None : Debug.ErrorLogLevel.Error;
|
||||||
this.LogError("Unhandled exception on connect: {error}", e.Message);
|
this.LogException(e, "Unhandled exception on connect");
|
||||||
this.LogVerbose(e, "Exception details: ");
|
|
||||||
DisconnectLogged = true;
|
DisconnectLogged = true;
|
||||||
KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
|
KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
|
||||||
if (AutoReconnect)
|
if (AutoReconnect)
|
||||||
@@ -327,18 +324,18 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Disconnect method
|
/// Disconnect the clients and put away it's resources.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Disconnect()
|
public void Disconnect()
|
||||||
{
|
{
|
||||||
ConnectEnabled = false;
|
ConnectEnabled = false;
|
||||||
// Stop trying reconnects, if we are
|
// Stop trying reconnects, if we are
|
||||||
if (ReconnectTimer != null)
|
if (ReconnectTimer != null)
|
||||||
{
|
{
|
||||||
ReconnectTimer.Stop();
|
ReconnectTimer.Stop();
|
||||||
// ReconnectTimer = null;
|
// ReconnectTimer = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
|
KillClient(SocketStatus.SOCKET_STATUS_BROKEN_LOCALLY);
|
||||||
}
|
}
|
||||||
@@ -364,7 +361,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
this.LogException(ex, "Exception in Kill Client");
|
this.LogException(ex,"Exception in Kill Client");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -372,7 +369,7 @@ namespace PepperDash.Core
|
|||||||
/// Kills the stream
|
/// Kills the stream
|
||||||
/// </summary>
|
/// </summary>
|
||||||
void KillStream()
|
void KillStream()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (TheStream != null)
|
if (TheStream != null)
|
||||||
@@ -388,59 +385,59 @@ namespace PepperDash.Core
|
|||||||
{
|
{
|
||||||
this.LogException(ex, "Exception in Kill Stream:{0}");
|
this.LogException(ex, "Exception in Kill Stream:{0}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Handles the keyboard interactive authentication, should it be required.
|
/// Handles the keyboard interactive authentication, should it be required.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
void kauth_AuthenticationPrompt(object sender, AuthenticationPromptEventArgs e)
|
void kauth_AuthenticationPrompt(object sender, AuthenticationPromptEventArgs e)
|
||||||
{
|
{
|
||||||
foreach (AuthenticationPrompt prompt in e.Prompts)
|
foreach (AuthenticationPrompt prompt in e.Prompts)
|
||||||
if (prompt.Request.IndexOf("Password:", StringComparison.InvariantCultureIgnoreCase) != -1)
|
if (prompt.Request.IndexOf("Password:", StringComparison.InvariantCultureIgnoreCase) != -1)
|
||||||
prompt.Response = Password;
|
prompt.Response = Password;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Handler for data receive on ShellStream. Passes data across to queue for line parsing.
|
/// Handler for data receive on ShellStream. Passes data across to queue for line parsing.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
void Stream_DataReceived(object sender, ShellDataEventArgs e)
|
void Stream_DataReceived(object sender, ShellDataEventArgs e)
|
||||||
{
|
{
|
||||||
if (((ShellStream)sender).Length <= 0L)
|
if (((ShellStream)sender).Length <= 0L)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var response = ((ShellStream)sender).Read();
|
var response = ((ShellStream)sender).Read();
|
||||||
|
|
||||||
var bytesHandler = BytesReceived;
|
var bytesHandler = BytesReceived;
|
||||||
|
|
||||||
if (bytesHandler != null)
|
if (bytesHandler != null)
|
||||||
{
|
{
|
||||||
var bytes = Encoding.UTF8.GetBytes(response);
|
var bytes = Encoding.UTF8.GetBytes(response);
|
||||||
if (StreamDebugging.RxStreamDebuggingIsEnabled)
|
if (StreamDebugging.RxStreamDebuggingIsEnabled)
|
||||||
{
|
{
|
||||||
this.LogInformation("Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
|
this.LogInformation("Received {1} bytes: '{0}'", ComTextHelper.GetEscapedText(bytes), bytes.Length);
|
||||||
}
|
}
|
||||||
bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
|
bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes));
|
||||||
}
|
}
|
||||||
|
|
||||||
var textHandler = TextReceived;
|
var textHandler = TextReceived;
|
||||||
if (textHandler != null)
|
if (textHandler != null)
|
||||||
{
|
{
|
||||||
if (StreamDebugging.RxStreamDebuggingIsEnabled)
|
if (StreamDebugging.RxStreamDebuggingIsEnabled)
|
||||||
this.LogInformation("Received: '{0}'", ComTextHelper.GetDebugText(response));
|
this.LogInformation("Received: '{0}'", ComTextHelper.GetDebugText(response));
|
||||||
|
|
||||||
textHandler(this, new GenericCommMethodReceiveTextArgs(response));
|
textHandler(this, new GenericCommMethodReceiveTextArgs(response));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Error event handler for client events - disconnect, etc. Will forward those events via ConnectionChange
|
/// Error event handler for client events - disconnect, etc. Will forward those events via ConnectionChange
|
||||||
/// event
|
/// event
|
||||||
/// </summary>
|
/// </summary>
|
||||||
void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
|
void Client_ErrorOccurred(object sender, ExceptionEventArgs e)
|
||||||
{
|
{
|
||||||
CrestronInvoke.BeginInvoke(o =>
|
CrestronInvoke.BeginInvoke(o =>
|
||||||
{
|
{
|
||||||
if (e.Exception is SshConnectionException || e.Exception is System.Net.Sockets.SocketException)
|
if (e.Exception is SshConnectionException || e.Exception is System.Net.Sockets.SocketException)
|
||||||
@@ -469,54 +466,55 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
void OnConnectionChange()
|
void OnConnectionChange()
|
||||||
{
|
{
|
||||||
ConnectionChange?.Invoke(this, new GenericSocketStatusChageEventArgs(this));
|
if (ConnectionChange != null)
|
||||||
|
ConnectionChange(this, new GenericSocketStatusChageEventArgs(this));
|
||||||
}
|
}
|
||||||
|
|
||||||
#region IBasicCommunication Members
|
#region IBasicCommunication Members
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Sends text to the server
|
/// Sends text to the server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="text">The text to send</param>
|
/// <param name="text"></param>
|
||||||
public void SendText(string text)
|
public void SendText(string text)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (Client != null && TheStream != null && IsConnected)
|
if (Client != null && TheStream != null && IsConnected)
|
||||||
{
|
{
|
||||||
if (StreamDebugging.TxStreamDebuggingIsEnabled)
|
if (StreamDebugging.TxStreamDebuggingIsEnabled)
|
||||||
this.LogInformation(
|
this.LogInformation(
|
||||||
"Sending {length} characters of text: '{text}'",
|
"Sending {length} characters of text: '{text}'",
|
||||||
text.Length,
|
text.Length,
|
||||||
ComTextHelper.GetDebugText(text));
|
ComTextHelper.GetDebugText(text));
|
||||||
|
|
||||||
TheStream.Write(text);
|
TheStream.Write(text);
|
||||||
TheStream.Flush();
|
TheStream.Flush();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.LogDebug("Client is null or disconnected. Cannot Send Text");
|
this.LogDebug("Client is null or disconnected. Cannot Send Text");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (ObjectDisposedException)
|
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);
|
KillClient(SocketStatus.SOCKET_STATUS_CONNECT_FAILED);
|
||||||
ReconnectTimer.Reset();
|
ReconnectTimer.Reset();
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
this.LogException(ex, "Exception sending text: '{message}'", text);
|
this.LogException(ex, "Exception sending text: '{message}'", text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Sends Bytes to the server
|
/// Sends Bytes to the server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="bytes">The bytes to send</param>
|
/// <param name="bytes"></param>
|
||||||
public void SendBytes(byte[] bytes)
|
public void SendBytes(byte[] bytes)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (Client != null && TheStream != null && IsConnected)
|
if (Client != null && TheStream != null && IsConnected)
|
||||||
@@ -542,38 +540,38 @@ namespace PepperDash.Core
|
|||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
this.LogException(ex, "Exception sending {message}", ComTextHelper.GetEscapedText(bytes));
|
this.LogException(ex, "Exception sending {message}", ComTextHelper.GetEscapedText(bytes));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//*****************************************************************************************************
|
//*****************************************************************************************************
|
||||||
//*****************************************************************************************************
|
//*****************************************************************************************************
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a SshConnectionChangeEventArgs
|
/// Fired when connection changes
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class SshConnectionChangeEventArgs : EventArgs
|
public class SshConnectionChangeEventArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Connection State
|
/// Connection State
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsConnected { get; private set; }
|
public bool IsConnected { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the UIsConnected
|
/// Connection Status represented as a ushort
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort UIsConnected { get { return (ushort)(Client.IsConnected ? 1 : 0); } }
|
public ushort UIsConnected { get { return (ushort)(Client.IsConnected ? 1 : 0); } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Client
|
/// The client
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public GenericSshClient Client { get; private set; }
|
public GenericSshClient Client { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Status
|
/// Socket Status as represented by
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort Status { get { return Client.UStatus; } }
|
public ushort Status { get { return Client.UStatus; } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// S+ Constructor
|
/// S+ Constructor
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Port
|
/// Port on server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Port { get; set; }
|
public int Port { get; set; }
|
||||||
|
|
||||||
@@ -135,9 +135,9 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string ConnectionFailure { get { return ClientStatus.ToString(); } }
|
public string ConnectionFailure { get { return ClientStatus.ToString(); } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the AutoReconnect
|
/// bool to track if auto reconnect should be set on the socket
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool AutoReconnect { get; set; }
|
public bool AutoReconnect { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -232,7 +232,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initialize method
|
/// Just to help S+ set the key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Initialize(string key)
|
public void Initialize(string key)
|
||||||
{
|
{
|
||||||
@@ -255,9 +255,6 @@ namespace PepperDash.Core
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// Deactivate method
|
|
||||||
/// </summary>
|
|
||||||
public override bool Deactivate()
|
public override bool Deactivate()
|
||||||
{
|
{
|
||||||
RetryTimer.Stop();
|
RetryTimer.Stop();
|
||||||
@@ -270,9 +267,9 @@ namespace PepperDash.Core
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Connect method
|
/// Attempts to connect to the server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Connect()
|
public void Connect()
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(Hostname))
|
if (string.IsNullOrEmpty(Hostname))
|
||||||
@@ -337,9 +334,9 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Disconnect method
|
/// Attempts to disconnect the client
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Disconnect()
|
public void Disconnect()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -358,7 +355,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// DisconnectClient method
|
/// Does the actual disconnect business
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void DisconnectClient()
|
public void DisconnectClient()
|
||||||
{
|
{
|
||||||
@@ -449,9 +446,9 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SendText method
|
/// General send method
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void SendText(string text)
|
public void SendText(string text)
|
||||||
{
|
{
|
||||||
var bytes = Encoding.GetEncoding(28591).GetBytes(text);
|
var bytes = Encoding.GetEncoding(28591).GetBytes(text);
|
||||||
@@ -462,9 +459,9 @@ namespace PepperDash.Core
|
|||||||
_client.SendData(bytes, bytes.Length);
|
_client.SendData(bytes, bytes.Length);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SendEscapedText method
|
/// This is useful from console and...?
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void SendEscapedText(string text)
|
public void SendEscapedText(string text)
|
||||||
{
|
{
|
||||||
var unescapedText = Regex.Replace(text, @"\\x([0-9a-fA-F][0-9a-fA-F])", s =>
|
var unescapedText = Regex.Replace(text, @"\\x([0-9a-fA-F][0-9a-fA-F])", s =>
|
||||||
@@ -479,9 +476,6 @@ namespace PepperDash.Core
|
|||||||
/// Sends Bytes to the server
|
/// Sends Bytes to the server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="bytes"></param>
|
/// <param name="bytes"></param>
|
||||||
/// <summary>
|
|
||||||
/// SendBytes method
|
|
||||||
/// </summary>
|
|
||||||
public void SendBytes(byte[] bytes)
|
public void SendBytes(byte[] bytes)
|
||||||
{
|
{
|
||||||
if (StreamDebugging.TxStreamDebuggingIsEnabled)
|
if (StreamDebugging.TxStreamDebuggingIsEnabled)
|
||||||
@@ -514,9 +508,9 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a TcpSshPropertiesConfig
|
/// Configuration properties for TCP/SSH Connections
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class TcpSshPropertiesConfig
|
public class TcpSshPropertiesConfig
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -535,9 +529,9 @@ namespace PepperDash.Core
|
|||||||
/// Username credential
|
/// Username credential
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Username { get; set; }
|
public string Username { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Password
|
/// Passord credential
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Password { get; set; }
|
public string Password { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -545,14 +539,14 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public int BufferSize { get; set; }
|
public int BufferSize { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the AutoReconnect
|
/// Defaults to true
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool AutoReconnect { get; set; }
|
public bool AutoReconnect { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the AutoReconnectIntervalMs
|
/// Defaults to 5000ms
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int AutoReconnectIntervalMs { get; set; }
|
public int AutoReconnectIntervalMs { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ namespace PepperDash.Core
|
|||||||
public string Hostname { get; set; }
|
public string Hostname { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Port
|
/// Port on server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Port { get; set; }
|
public int Port { get; set; }
|
||||||
|
|
||||||
@@ -102,7 +102,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the SharedKey
|
/// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string SharedKey { get; set; }
|
public string SharedKey { get; set; }
|
||||||
|
|
||||||
@@ -112,7 +112,7 @@ namespace PepperDash.Core
|
|||||||
private bool WaitingForSharedKeyResponse { get; set; }
|
private bool WaitingForSharedKeyResponse { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the BufferSize
|
/// Defaults to 2000
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int BufferSize { get; set; }
|
public int BufferSize { get; set; }
|
||||||
|
|
||||||
@@ -289,7 +289,7 @@ namespace PepperDash.Core
|
|||||||
#region Methods
|
#region Methods
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initialize method
|
/// Just to help S+ set the key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Initialize(string key)
|
public void Initialize(string key)
|
||||||
{
|
{
|
||||||
@@ -311,7 +311,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Connect method
|
/// Connect Method. Will return if already connected. Will write errors if missing address, port, or unique key/name.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Connect()
|
public void Connect()
|
||||||
{
|
{
|
||||||
@@ -442,7 +442,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Disconnect method
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Disconnect()
|
public void Disconnect()
|
||||||
{
|
{
|
||||||
@@ -669,7 +669,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SendText method
|
/// General send method
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void SendText(string text)
|
public void SendText(string text)
|
||||||
{
|
{
|
||||||
@@ -698,7 +698,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SendBytes method
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void SendBytes(byte[] bytes)
|
public void SendBytes(byte[] bytes)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ namespace PepperDash.Core
|
|||||||
public ServerHasChokedCallbackDelegate ServerHasChoked { get; set; }
|
public ServerHasChokedCallbackDelegate ServerHasChoked { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Delegate for ServerHasChokedCallbackDelegate
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public delegate void ServerHasChokedCallbackDelegate();
|
public delegate void ServerHasChokedCallbackDelegate();
|
||||||
|
|
||||||
@@ -82,7 +82,7 @@ namespace PepperDash.Core
|
|||||||
int MonitorClientFailureCount;
|
int MonitorClientFailureCount;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the MonitorClientMaxFailureCount
|
/// 3 by default
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int MonitorClientMaxFailureCount { get; set; }
|
public int MonitorClientMaxFailureCount { get; set; }
|
||||||
|
|
||||||
@@ -171,7 +171,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Port
|
/// Port Server should listen on
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int Port { get; set; }
|
public int Port { get; set; }
|
||||||
|
|
||||||
@@ -204,7 +204,8 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the SharedKey
|
/// SharedKey is sent for varification to the server. Shared key can be any text (255 char limit in SIMPL+ Module), but must match the Shared Key on the Server module.
|
||||||
|
/// If SharedKey changes while server is listening or clients are connected, disconnect and stop listening will be called
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string SharedKey { get; set; }
|
public string SharedKey { get; set; }
|
||||||
|
|
||||||
@@ -228,7 +229,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the HeartbeatRequiredIntervalMs
|
/// Milliseconds before server expects another heartbeat. Set by property HeartbeatRequiredIntervalInSeconds which is driven from S+
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int HeartbeatRequiredIntervalMs { get; set; }
|
public int HeartbeatRequiredIntervalMs { get; set; }
|
||||||
|
|
||||||
@@ -238,7 +239,7 @@ namespace PepperDash.Core
|
|||||||
public ushort HeartbeatRequiredIntervalInSeconds { set { HeartbeatRequiredIntervalMs = (value * 1000); } }
|
public ushort HeartbeatRequiredIntervalInSeconds { set { HeartbeatRequiredIntervalMs = (value * 1000); } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the HeartbeatStringToMatch
|
/// String to Match for heartbeat. If null or empty any string will reset heartbeat timer
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string HeartbeatStringToMatch { get; set; }
|
public string HeartbeatStringToMatch { get; set; }
|
||||||
|
|
||||||
@@ -256,7 +257,7 @@ namespace PepperDash.Core
|
|||||||
public List<uint> ConnectedClientsIndexes = new List<uint>();
|
public List<uint> ConnectedClientsIndexes = new List<uint>();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the BufferSize
|
/// Defaults to 2000
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int BufferSize { get; set; }
|
public int BufferSize { get; set; }
|
||||||
|
|
||||||
@@ -319,7 +320,7 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
#region Methods - Server Actions
|
#region Methods - Server Actions
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// KillServer method
|
/// Disconnects all clients and stops the server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void KillServer()
|
public void KillServer()
|
||||||
{
|
{
|
||||||
@@ -336,9 +337,6 @@ namespace PepperDash.Core
|
|||||||
/// Initialize Key for device using client name from SIMPL+. Called on Listen from SIMPL+
|
/// Initialize Key for device using client name from SIMPL+. Called on Listen from SIMPL+
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <summary>
|
|
||||||
/// Initialize method
|
|
||||||
/// </summary>
|
|
||||||
public void Initialize(string key)
|
public void Initialize(string key)
|
||||||
{
|
{
|
||||||
Key = key;
|
Key = key;
|
||||||
@@ -377,7 +375,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Listen method
|
/// Start listening on the specified port
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Listen()
|
public void Listen()
|
||||||
{
|
{
|
||||||
@@ -434,7 +432,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// StopListening method
|
/// Stop Listening
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void StopListening()
|
public void StopListening()
|
||||||
{
|
{
|
||||||
@@ -459,9 +457,6 @@ namespace PepperDash.Core
|
|||||||
/// Disconnects Client
|
/// Disconnects Client
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="client"></param>
|
/// <param name="client"></param>
|
||||||
/// <summary>
|
|
||||||
/// DisconnectClient method
|
|
||||||
/// </summary>
|
|
||||||
public void DisconnectClient(uint client)
|
public void DisconnectClient(uint client)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -475,7 +470,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// DisconnectAllClientsForShutdown method
|
/// Disconnect All Clients
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void DisconnectAllClientsForShutdown()
|
public void DisconnectAllClientsForShutdown()
|
||||||
{
|
{
|
||||||
@@ -517,9 +512,6 @@ namespace PepperDash.Core
|
|||||||
/// Broadcast text from server to all connected clients
|
/// Broadcast text from server to all connected clients
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="text"></param>
|
/// <param name="text"></param>
|
||||||
/// <summary>
|
|
||||||
/// BroadcastText method
|
|
||||||
/// </summary>
|
|
||||||
public void BroadcastText(string text)
|
public void BroadcastText(string text)
|
||||||
{
|
{
|
||||||
CCriticalSection CCBroadcast = new CCriticalSection();
|
CCriticalSection CCBroadcast = new CCriticalSection();
|
||||||
@@ -553,9 +545,6 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="text"></param>
|
/// <param name="text"></param>
|
||||||
/// <param name="clientIndex"></param>
|
/// <param name="clientIndex"></param>
|
||||||
/// <summary>
|
|
||||||
/// SendTextToClient method
|
|
||||||
/// </summary>
|
|
||||||
public void SendTextToClient(string text, uint clientIndex)
|
public void SendTextToClient(string text, uint clientIndex)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -624,9 +613,6 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="clientIndex"></param>
|
/// <param name="clientIndex"></param>
|
||||||
/// <returns>IP address of the client</returns>
|
/// <returns>IP address of the client</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetClientIPAddress method
|
|
||||||
/// </summary>
|
|
||||||
public string GetClientIPAddress(uint clientIndex)
|
public string GetClientIPAddress(uint clientIndex)
|
||||||
{
|
{
|
||||||
Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "GetClientIPAddress Index: {0}", clientIndex);
|
Debug.Console(1, this, Debug.ErrorLogLevel.Notice, "GetClientIPAddress Index: {0}", clientIndex);
|
||||||
|
|||||||
@@ -150,9 +150,6 @@ namespace PepperDash.Core
|
|||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <param name="address"></param>
|
/// <param name="address"></param>
|
||||||
/// <param name="port"></param>
|
/// <param name="port"></param>
|
||||||
/// <summary>
|
|
||||||
/// Initialize method
|
|
||||||
/// </summary>
|
|
||||||
public void Initialize(string key, string address, ushort port)
|
public void Initialize(string key, string address, ushort port)
|
||||||
{
|
{
|
||||||
Key = key;
|
Key = key;
|
||||||
@@ -188,7 +185,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Connect method
|
/// Enables the UDP Server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Connect()
|
public void Connect()
|
||||||
{
|
{
|
||||||
@@ -225,7 +222,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Disconnect method
|
/// Disabled the UDP Server
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Disconnect()
|
public void Disconnect()
|
||||||
{
|
{
|
||||||
@@ -295,9 +292,6 @@ namespace PepperDash.Core
|
|||||||
/// General send method
|
/// General send method
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="text"></param>
|
/// <param name="text"></param>
|
||||||
/// <summary>
|
|
||||||
/// SendText method
|
|
||||||
/// </summary>
|
|
||||||
public void SendText(string text)
|
public void SendText(string text)
|
||||||
{
|
{
|
||||||
var bytes = Encoding.GetEncoding(28591).GetBytes(text);
|
var bytes = Encoding.GetEncoding(28591).GetBytes(text);
|
||||||
@@ -315,9 +309,6 @@ namespace PepperDash.Core
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="bytes"></param>
|
/// <param name="bytes"></param>
|
||||||
/// <summary>
|
|
||||||
/// SendBytes method
|
|
||||||
/// </summary>
|
|
||||||
public void SendBytes(byte[] bytes)
|
public void SendBytes(byte[] bytes)
|
||||||
{
|
{
|
||||||
if (StreamDebugging.TxStreamDebuggingIsEnabled)
|
if (StreamDebugging.TxStreamDebuggingIsEnabled)
|
||||||
@@ -329,9 +320,9 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a GenericUdpReceiveTextExtraArgs
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class GenericUdpReceiveTextExtraArgs : EventArgs
|
public class GenericUdpReceiveTextExtraArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
namespace PepperDash.Core
|
namespace PepperDash.Core
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a TcpClientConfigObject
|
/// Client config object for TCP client with server that inherits from TcpSshPropertiesConfig and adds properties for shared key and heartbeat
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class TcpClientConfigObject
|
public class TcpClientConfigObject
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -38,9 +38,9 @@ namespace PepperDash.Core
|
|||||||
void Disconnect();
|
void Disconnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Defines the contract for IBasicCommunication
|
/// Represents a device that uses basic connection
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public interface IBasicCommunication : ICommunicationReceiver
|
public interface IBasicCommunication : ICommunicationReceiver
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -147,9 +147,9 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class GenericCommMethodReceiveBytesArgs : EventArgs
|
public class GenericCommMethodReceiveBytesArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Bytes
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public byte[] Bytes { get; private set; }
|
public byte[] Bytes { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -228,9 +228,6 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="text"></param>
|
/// <param name="text"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// GetEscapedText method
|
|
||||||
/// </summary>
|
|
||||||
public static string GetEscapedText(string text)
|
public static string GetEscapedText(string text)
|
||||||
{
|
{
|
||||||
var bytes = Encoding.GetEncoding(28591).GetBytes(text);
|
var bytes = Encoding.GetEncoding(28591).GetBytes(text);
|
||||||
@@ -242,9 +239,6 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="text"></param>
|
/// <param name="text"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// GetDebugText method
|
|
||||||
/// </summary>
|
|
||||||
public static string GetDebugText(string text)
|
public static string GetDebugText(string text)
|
||||||
{
|
{
|
||||||
return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
|
return Regex.Replace(text, @"[^\u0020-\u007E]", a => GetEscapedText(a.Value));
|
||||||
|
|||||||
@@ -67,9 +67,6 @@ namespace PepperDash.Core.Config
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="doubleConfig"></param>
|
/// <param name="doubleConfig"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// MergeConfigs method
|
|
||||||
/// </summary>
|
|
||||||
public static JObject MergeConfigs(JObject doubleConfig)
|
public static JObject MergeConfigs(JObject doubleConfig)
|
||||||
{
|
{
|
||||||
var system = JObject.FromObject(doubleConfig["system"]);
|
var system = JObject.FromObject(doubleConfig["system"]);
|
||||||
|
|||||||
@@ -6,22 +6,13 @@ using Crestron.SimplSharp;
|
|||||||
|
|
||||||
namespace PepperDash.Core
|
namespace PepperDash.Core
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a EncodingHelper
|
|
||||||
/// </summary>
|
|
||||||
public class EncodingHelper
|
public class EncodingHelper
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// ConvertUtf8ToAscii method
|
|
||||||
/// </summary>
|
|
||||||
public static string ConvertUtf8ToAscii(string utf8String)
|
public static string ConvertUtf8ToAscii(string utf8String)
|
||||||
{
|
{
|
||||||
return Encoding.ASCII.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
|
return Encoding.ASCII.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ConvertUtf8ToUtf16 method
|
|
||||||
/// </summary>
|
|
||||||
public static string ConvertUtf8ToUtf16(string utf8String)
|
public static string ConvertUtf8ToUtf16(string utf8String)
|
||||||
{
|
{
|
||||||
return Encoding.Unicode.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
|
return Encoding.Unicode.GetString(Encoding.UTF8.GetBytes(utf8String), 0, utf8String.Length);
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ using Serilog.Events;
|
|||||||
namespace PepperDash.Core
|
namespace PepperDash.Core
|
||||||
{
|
{
|
||||||
//*********************************************************************************************************
|
//*********************************************************************************************************
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a Device
|
/// The core event and status-bearing class that most if not all device and connectors can derive from.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class Device : IKeyName
|
public class Device : IKeyName
|
||||||
{
|
{
|
||||||
|
|
||||||
@@ -15,23 +15,23 @@ namespace PepperDash.Core
|
|||||||
/// Unique Key
|
/// Unique Key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Key { get; protected set; }
|
public string Key { get; protected set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Name
|
/// Name of the devie
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Name { get; protected set; }
|
public string Name { get; protected set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool Enabled { get; protected set; }
|
public bool Enabled { get; protected set; }
|
||||||
|
|
||||||
/// <summary>
|
///// <summary>
|
||||||
/// A place to store reference to the original config object, if any. These values should
|
///// A place to store reference to the original config object, if any. These values should
|
||||||
/// NOT be used as properties on the device as they are all publicly-settable values.
|
///// NOT be used as properties on the device as they are all publicly-settable values.
|
||||||
/// </summary>
|
///// </summary>
|
||||||
//public DeviceConfig Config { get; private set; }
|
//public DeviceConfig Config { get; private set; }
|
||||||
/// <summary>
|
///// <summary>
|
||||||
/// Helper method to check if Config exists
|
///// Helper method to check if Config exists
|
||||||
/// </summary>
|
///// </summary>
|
||||||
//public bool HasConfig { get { return Config != null; } }
|
//public bool HasConfig { get { return Config != null; } }
|
||||||
|
|
||||||
List<Action> _PreActivationActions;
|
List<Action> _PreActivationActions;
|
||||||
@@ -86,9 +86,6 @@ namespace PepperDash.Core
|
|||||||
/// Adds a post activation action
|
/// Adds a post activation action
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="act"></param>
|
/// <param name="act"></param>
|
||||||
/// <summary>
|
|
||||||
/// AddPostActivationAction method
|
|
||||||
/// </summary>
|
|
||||||
public void AddPostActivationAction(Action act)
|
public void AddPostActivationAction(Action act)
|
||||||
{
|
{
|
||||||
if (_PostActivationActions == null)
|
if (_PostActivationActions == null)
|
||||||
@@ -96,9 +93,9 @@ namespace PepperDash.Core
|
|||||||
_PostActivationActions.Add(act);
|
_PostActivationActions.Add(act);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// PreActivate method
|
/// Executes the preactivation actions
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void PreActivate()
|
public void PreActivate()
|
||||||
{
|
{
|
||||||
if (_PreActivationActions != null)
|
if (_PreActivationActions != null)
|
||||||
@@ -115,9 +112,11 @@ namespace PepperDash.Core
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Activate method
|
/// Gets this device ready to be used in the system. Runs any added pre-activation items, and
|
||||||
/// </summary>
|
/// all post-activation at end. Classes needing additional logic to
|
||||||
|
/// run should override CustomActivate()
|
||||||
|
/// </summary>
|
||||||
public bool Activate()
|
public bool Activate()
|
||||||
{
|
{
|
||||||
//if (_PreActivationActions != null)
|
//if (_PreActivationActions != null)
|
||||||
@@ -128,9 +127,9 @@ namespace PepperDash.Core
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// PostActivate method
|
/// Executes the postactivation actions
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void PostActivate()
|
public void PostActivate()
|
||||||
{
|
{
|
||||||
if (_PostActivationActions != null)
|
if (_PostActivationActions != null)
|
||||||
@@ -153,9 +152,6 @@ namespace PepperDash.Core
|
|||||||
/// do not need to call base.CustomActivate()
|
/// do not need to call base.CustomActivate()
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>true if device activated successfully.</returns>
|
/// <returns>true if device activated successfully.</returns>
|
||||||
/// <summary>
|
|
||||||
/// CustomActivate method
|
|
||||||
/// </summary>
|
|
||||||
public virtual bool CustomActivate() { return true; }
|
public virtual bool CustomActivate() { return true; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -182,15 +178,12 @@ namespace PepperDash.Core
|
|||||||
if (o is bool && !(bool)o) a();
|
if (o is bool && !(bool)o) a();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns a string representation of the object, including its key and name.
|
/// Returns a string representation of the object, including its key and name.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>The returned string is formatted as "{Key} - {Name}". If the <c>Name</c> property is
|
/// <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>
|
/// 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>
|
/// <returns>A string that represents the object, containing the key and name in the format "{Key} - {Name}".</returns>
|
||||||
/// <summary>
|
|
||||||
/// ToString method
|
|
||||||
/// </summary>
|
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
{
|
{
|
||||||
return string.Format("{0} - {1}", Key, string.IsNullOrEmpty(Name) ? "---" : Name);
|
return string.Format("{0} - {1}", Key, string.IsNullOrEmpty(Name) ? "---" : Name);
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ using Serilog.Events;
|
|||||||
|
|
||||||
namespace PepperDash.Core
|
namespace PepperDash.Core
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a EthernetHelper
|
/// Class to help with accessing values from the CrestronEthernetHelper class
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class EthernetHelper
|
public class EthernetHelper
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -24,9 +24,9 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
// ADD OTHER HELPERS HERE
|
// ADD OTHER HELPERS HERE
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the PortNumber
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int PortNumber { get; private set; }
|
public int PortNumber { get; private set; }
|
||||||
|
|
||||||
private EthernetHelper(int portNumber)
|
private EthernetHelper(int portNumber)
|
||||||
|
|||||||
@@ -16,19 +16,19 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public bool State { get; set; }
|
public bool State { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the IntValue
|
/// Boolean ushort value property
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort IntValue { get { return (ushort)(State ? 1 : 0); } }
|
public ushort IntValue { get { return (ushort)(State ? 1 : 0); } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Type
|
/// Boolean change event args type
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort Type { get; set; }
|
public ushort Type { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Index
|
/// Boolean change event args index
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort Index { get; set; }
|
public ushort Index { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -64,9 +64,9 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a UshrtChangeEventArgs
|
/// Ushort change event args
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class UshrtChangeEventArgs : EventArgs
|
public class UshrtChangeEventArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -74,14 +74,14 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort IntValue { get; set; }
|
public ushort IntValue { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Type
|
/// Ushort change event args type
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort Type { get; set; }
|
public ushort Type { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Index
|
/// Ushort change event args index
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort Index { get; set; }
|
public ushort Index { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -117,9 +117,9 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a StringChangeEventArgs
|
/// String change event args
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class StringChangeEventArgs : EventArgs
|
public class StringChangeEventArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -127,14 +127,14 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string StringValue { get; set; }
|
public string StringValue { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Type
|
/// String change event args type
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort Type { get; set; }
|
public ushort Type { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Index
|
/// string change event args index
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort Index { get; set; }
|
public ushort Index { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -32,14 +32,14 @@ namespace PepperDash.Core.JsonStandardObjects
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public DeviceConfig Device { get; set; }
|
public DeviceConfig Device { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Type
|
/// Device change event args type
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort Type { get; set; }
|
public ushort Type { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Index
|
/// Device change event args index
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort Index { get; set; }
|
public ushort Index { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -58,9 +58,6 @@ namespace PepperDash.Core.JsonStandardObjects
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="uniqueID"></param>
|
/// <param name="uniqueID"></param>
|
||||||
/// <param name="deviceKey"></param>
|
/// <param name="deviceKey"></param>
|
||||||
/// <summary>
|
|
||||||
/// Initialize method
|
|
||||||
/// </summary>
|
|
||||||
public void Initialize(string uniqueID, string deviceKey)
|
public void Initialize(string uniqueID, string deviceKey)
|
||||||
{
|
{
|
||||||
// S+ set EvaluateFb low
|
// S+ set EvaluateFb low
|
||||||
|
|||||||
@@ -47,14 +47,14 @@ namespace PepperDash.Core.JsonStandardObjects
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a ComParamsConfig
|
/// Device communication parameter class
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ComParamsConfig
|
public class ComParamsConfig
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the baudRate
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int baudRate { get; set; }
|
public int baudRate { get; set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
@@ -86,13 +86,13 @@ namespace PepperDash.Core.JsonStandardObjects
|
|||||||
public int pacing { get; set; }
|
public int pacing { get; set; }
|
||||||
|
|
||||||
// convert properties for simpl
|
// convert properties for simpl
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the simplBaudRate
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort simplBaudRate { get { return Convert.ToUInt16(baudRate); } }
|
public ushort simplBaudRate { get { return Convert.ToUInt16(baudRate); } }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the simplDataBits
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort simplDataBits { get { return Convert.ToUInt16(dataBits); } }
|
public ushort simplDataBits { get { return Convert.ToUInt16(dataBits); } }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
@@ -143,13 +143,13 @@ namespace PepperDash.Core.JsonStandardObjects
|
|||||||
public int autoReconnectIntervalMs { get; set; }
|
public int autoReconnectIntervalMs { get; set; }
|
||||||
|
|
||||||
// convert properties for simpl
|
// convert properties for simpl
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the simplPort
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort simplPort { get { return Convert.ToUInt16(port); } }
|
public ushort simplPort { get { return Convert.ToUInt16(port); } }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the simplAutoReconnect
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort simplAutoReconnect { get { return (ushort)(autoReconnect ? 1 : 0); } }
|
public ushort simplAutoReconnect { get { return (ushort)(autoReconnect ? 1 : 0); } }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
@@ -192,9 +192,9 @@ namespace PepperDash.Core.JsonStandardObjects
|
|||||||
public TcpSshPropertiesConfig tcpSshProperties { get; set; }
|
public TcpSshPropertiesConfig tcpSshProperties { get; set; }
|
||||||
|
|
||||||
// convert properties for simpl
|
// convert properties for simpl
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the simplControlPortNumber
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort simplControlPortNumber { get { return Convert.ToUInt16(controlPortNumber); } }
|
public ushort simplControlPortNumber { get { return Convert.ToUInt16(controlPortNumber); } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -207,9 +207,9 @@ namespace PepperDash.Core.JsonStandardObjects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a PropertiesConfig
|
/// Device properties class
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class PropertiesConfig
|
public class PropertiesConfig
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -226,13 +226,13 @@ namespace PepperDash.Core.JsonStandardObjects
|
|||||||
public ControlConfig control { get; set; }
|
public ControlConfig control { get; set; }
|
||||||
|
|
||||||
// convert properties for simpl
|
// convert properties for simpl
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the simplDeviceId
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort simplDeviceId { get { return Convert.ToUInt16(deviceId); } }
|
public ushort simplDeviceId { get { return Convert.ToUInt16(deviceId); } }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the simplEnabled
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort simplEnabled { get { return (ushort)(enabled ? 1 : 0); } }
|
public ushort simplEnabled { get { return (ushort)(enabled ? 1 : 0); } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -88,9 +88,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class SPlusValueWrapper
|
public class SPlusValueWrapper
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the ValueType
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public SPlusType ValueType { get; private set; }
|
public SPlusType ValueType { get; private set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
@@ -122,9 +122,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Enumeration of SPlusType values
|
/// S+ types enum
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public enum SPlusType
|
public enum SPlusType
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -23,9 +23,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="master">New master to add</param>
|
/// <param name="master">New master to add</param>
|
||||||
///
|
///
|
||||||
/// <summary>
|
|
||||||
/// AddMaster method
|
|
||||||
/// </summary>
|
|
||||||
public static void AddMaster(JsonToSimplMaster master)
|
public static void AddMaster(JsonToSimplMaster master)
|
||||||
{
|
{
|
||||||
if (master == null)
|
if (master == null)
|
||||||
@@ -52,9 +49,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// GetMasterByFile method
|
/// Gets a master by its key. Case-insensitive
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static JsonToSimplMaster GetMasterByFile(string file)
|
public static JsonToSimplMaster GetMasterByFile(string file)
|
||||||
{
|
{
|
||||||
return Masters.FirstOrDefault(m => m.UniqueID.Equals(file, StringComparison.OrdinalIgnoreCase));
|
return Masters.FirstOrDefault(m => m.UniqueID.Equals(file, StringComparison.OrdinalIgnoreCase));
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ using Serilog.Events;
|
|||||||
|
|
||||||
namespace PepperDash.Core.JsonToSimpl
|
namespace PepperDash.Core.JsonToSimpl
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a JsonToSimplArrayLookupChild
|
/// Used to interact with an array of values with the S+ modules
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class JsonToSimplArrayLookupChild : JsonToSimplChildObjectBase
|
public class JsonToSimplArrayLookupChild : JsonToSimplChildObjectBase
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -76,10 +76,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
PathSuffix == null ? "" : PathSuffix);
|
PathSuffix == null ? "" : PathSuffix);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ProcessAll method
|
/// Process all values
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <inheritdoc />
|
|
||||||
public override void ProcessAll()
|
public override void ProcessAll()
|
||||||
{
|
{
|
||||||
if (FindInArray())
|
if (FindInArray())
|
||||||
|
|||||||
@@ -28,14 +28,14 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public SPlusValuesDelegate GetAllValuesDelegate { get; set; }
|
public SPlusValuesDelegate GetAllValuesDelegate { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the SetAllPathsDelegate
|
/// Use a callback to reduce task switch/threading
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public SPlusValuesDelegate SetAllPathsDelegate { get; set; }
|
public SPlusValuesDelegate SetAllPathsDelegate { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Key
|
/// Unique identifier for instance
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Key { get; protected set; }
|
public string Key { get; protected set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -49,9 +49,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string PathSuffix { get; protected set; }
|
public string PathSuffix { get; protected set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the LinkedToObject
|
/// Indicates if the instance is linked to an object
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool LinkedToObject { get; protected set; }
|
public bool LinkedToObject { get; protected set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -96,9 +96,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// Sets the path prefix for the object
|
/// Sets the path prefix for the object
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="pathPrefix"></param>
|
/// <param name="pathPrefix"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetPathPrefix method
|
|
||||||
/// </summary>
|
|
||||||
public void SetPathPrefix(string pathPrefix)
|
public void SetPathPrefix(string pathPrefix)
|
||||||
{
|
{
|
||||||
PathPrefix = pathPrefix;
|
PathPrefix = pathPrefix;
|
||||||
@@ -113,9 +110,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
BoolPaths[index] = path;
|
BoolPaths[index] = path;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SetUshortPath method
|
/// Set the JPath for a ushort out index.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void SetUshortPath(ushort index, string path)
|
public void SetUshortPath(ushort index, string path)
|
||||||
{
|
{
|
||||||
Debug.Console(1, "JSON Child[{0}] SetUshortPath {1}={2}", Key, index, path);
|
Debug.Console(1, "JSON Child[{0}] SetUshortPath {1}={2}", Key, index, path);
|
||||||
@@ -123,9 +120,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
UshortPaths[index] = path;
|
UshortPaths[index] = path;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SetStringPath method
|
/// Set the JPath for a string output index.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void SetStringPath(ushort index, string path)
|
public void SetStringPath(ushort index, string path)
|
||||||
{
|
{
|
||||||
Debug.Console(1, "JSON Child[{0}] SetStringPath {1}={2}", Key, index, path);
|
Debug.Console(1, "JSON Child[{0}] SetStringPath {1}={2}", Key, index, path);
|
||||||
@@ -133,10 +130,10 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
StringPaths[index] = path;
|
StringPaths[index] = path;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ProcessAll method
|
/// Evalutates all outputs with defined paths. called by S+ when paths are ready to process
|
||||||
/// </summary>
|
/// and by Master when file is read.
|
||||||
/// <inheritdoc />
|
/// </summary>
|
||||||
public virtual void ProcessAll()
|
public virtual void ProcessAll()
|
||||||
{
|
{
|
||||||
if (!LinkedToObject)
|
if (!LinkedToObject)
|
||||||
@@ -280,9 +277,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <param name="theValue"></param>
|
/// <param name="theValue"></param>
|
||||||
/// <summary>
|
|
||||||
/// USetBoolValue method
|
|
||||||
/// </summary>
|
|
||||||
public void USetBoolValue(ushort key, ushort theValue)
|
public void USetBoolValue(ushort key, ushort theValue)
|
||||||
{
|
{
|
||||||
SetBoolValue(key, theValue == 1);
|
SetBoolValue(key, theValue == 1);
|
||||||
@@ -293,9 +287,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <param name="theValue"></param>
|
/// <param name="theValue"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetBoolValue method
|
|
||||||
/// </summary>
|
|
||||||
public void SetBoolValue(ushort key, bool theValue)
|
public void SetBoolValue(ushort key, bool theValue)
|
||||||
{
|
{
|
||||||
if (BoolPaths.ContainsKey(key))
|
if (BoolPaths.ContainsKey(key))
|
||||||
@@ -307,9 +298,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <param name="theValue"></param>
|
/// <param name="theValue"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetUShortValue method
|
|
||||||
/// </summary>
|
|
||||||
public void SetUShortValue(ushort key, ushort theValue)
|
public void SetUShortValue(ushort key, ushort theValue)
|
||||||
{
|
{
|
||||||
if (UshortPaths.ContainsKey(key))
|
if (UshortPaths.ContainsKey(key))
|
||||||
@@ -321,9 +309,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <param name="theValue"></param>
|
/// <param name="theValue"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetStringValue method
|
|
||||||
/// </summary>
|
|
||||||
public void SetStringValue(ushort key, string theValue)
|
public void SetStringValue(ushort key, string theValue)
|
||||||
{
|
{
|
||||||
if (StringPaths.ContainsKey(key))
|
if (StringPaths.ContainsKey(key))
|
||||||
@@ -335,9 +320,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="keyPath"></param>
|
/// <param name="keyPath"></param>
|
||||||
/// <param name="valueToSave"></param>
|
/// <param name="valueToSave"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetValueOnMaster method
|
|
||||||
/// </summary>
|
|
||||||
public void SetValueOnMaster(string keyPath, JValue valueToSave)
|
public void SetValueOnMaster(string keyPath, JValue valueToSave)
|
||||||
{
|
{
|
||||||
var path = GetFullPath(keyPath);
|
var path = GetFullPath(keyPath);
|
||||||
|
|||||||
@@ -20,12 +20,12 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
public string Filepath { get; private set; }
|
public string Filepath { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the ActualFilePath
|
/// Filepath to the actual file that will be read (Portal or local)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string ActualFilePath { get; private set; }
|
public string ActualFilePath { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Filename
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Filename { get; private set; }
|
public string Filename { get; private set; }
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -194,9 +194,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// Sets the debug level
|
/// Sets the debug level
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="level"></param>
|
/// <param name="level"></param>
|
||||||
/// <summary>
|
|
||||||
/// setDebugLevel method
|
|
||||||
/// </summary>
|
|
||||||
public void setDebugLevel(uint level)
|
public void setDebugLevel(uint level)
|
||||||
{
|
{
|
||||||
Debug.SetDebugLevel(level);
|
Debug.SetDebugLevel(level);
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
namespace PepperDash.Core.JsonToSimpl
|
namespace PepperDash.Core.JsonToSimpl
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a JsonToSimplFixedPathObject
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class JsonToSimplFixedPathObject : JsonToSimplChildObjectBase
|
public class JsonToSimplFixedPathObject : JsonToSimplChildObjectBase
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ using Newtonsoft.Json.Linq;
|
|||||||
|
|
||||||
namespace PepperDash.Core.JsonToSimpl
|
namespace PepperDash.Core.JsonToSimpl
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a JsonToSimplGenericMaster
|
/// Generic Master
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class JsonToSimplGenericMaster : JsonToSimplMaster
|
public class JsonToSimplGenericMaster : JsonToSimplMaster
|
||||||
{
|
{
|
||||||
/*****************************************************************************************/
|
/*****************************************************************************************/
|
||||||
@@ -20,9 +20,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
// To prevent multiple same-file access
|
// To prevent multiple same-file access
|
||||||
static object WriteLock = new object();
|
static object WriteLock = new object();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the SaveCallback
|
/// Callback action for saving
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Action<string> SaveCallback { get; set; }
|
public Action<string> SaveCallback { get; set; }
|
||||||
|
|
||||||
/*****************************************************************************************/
|
/*****************************************************************************************/
|
||||||
@@ -60,9 +60,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// Loads JSON into JsonObject, but does not trigger evaluation by children
|
/// Loads JSON into JsonObject, but does not trigger evaluation by children
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="json"></param>
|
/// <param name="json"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetJsonWithoutEvaluating method
|
|
||||||
/// </summary>
|
|
||||||
public void SetJsonWithoutEvaluating(string json)
|
public void SetJsonWithoutEvaluating(string json)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -75,10 +72,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Save method
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <inheritdoc />
|
|
||||||
public override void Save()
|
public override void Save()
|
||||||
{
|
{
|
||||||
// this code is duplicated in the other masters!!!!!!!!!!!!!
|
// this code is duplicated in the other masters!!!!!!!!!!!!!
|
||||||
|
|||||||
@@ -38,9 +38,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string Key { get { return UniqueID; } }
|
public string Key { get { return UniqueID; } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the UniqueID
|
/// A unique ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string UniqueID { get; protected set; }
|
public string UniqueID { get; protected set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -53,9 +53,10 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
}
|
}
|
||||||
string _DebugName = "";
|
string _DebugName = "";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the PathPrefix
|
/// This will be prepended to all paths to allow path swapping or for more organized
|
||||||
/// </summary>
|
/// sub-paths
|
||||||
|
/// </summary>
|
||||||
public string PathPrefix { get; set; }
|
public string PathPrefix { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -82,9 +83,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the JsonObject
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public JObject JsonObject { get; protected set; }
|
public JObject JsonObject { get; protected set; }
|
||||||
|
|
||||||
/*****************************************************************************************/
|
/*****************************************************************************************/
|
||||||
@@ -119,9 +120,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// Adds a child "module" to this master
|
/// Adds a child "module" to this master
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="child"></param>
|
/// <param name="child"></param>
|
||||||
/// <summary>
|
|
||||||
/// AddChild method
|
|
||||||
/// </summary>
|
|
||||||
public void AddChild(JsonToSimplChildObjectBase child)
|
public void AddChild(JsonToSimplChildObjectBase child)
|
||||||
{
|
{
|
||||||
if (!Children.Contains(child))
|
if (!Children.Contains(child))
|
||||||
@@ -130,9 +128,9 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// AddUnsavedValue method
|
/// Called from the child to add changed or new values for saving
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void AddUnsavedValue(string path, JValue value)
|
public void AddUnsavedValue(string path, JValue value)
|
||||||
{
|
{
|
||||||
if (UnsavedValues.ContainsKey(path))
|
if (UnsavedValues.ContainsKey(path))
|
||||||
@@ -181,9 +179,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="json"></param>
|
/// <param name="json"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// ParseArray method
|
|
||||||
/// </summary>
|
|
||||||
public static JArray ParseArray(string json)
|
public static JArray ParseArray(string json)
|
||||||
{
|
{
|
||||||
#if NET6_0
|
#if NET6_0
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
public string PortalFilepath { get; private set; }
|
public string PortalFilepath { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the ActualFilePath
|
/// File path of the actual file being read (Portal or local)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string ActualFilePath { get; private set; }
|
public string ActualFilePath { get; private set; }
|
||||||
|
|
||||||
@@ -128,9 +128,6 @@ namespace PepperDash.Core.JsonToSimpl
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="level"></param>
|
/// <param name="level"></param>
|
||||||
/// <summary>
|
|
||||||
/// setDebugLevel method
|
|
||||||
/// </summary>
|
|
||||||
public void setDebugLevel(uint level)
|
public void setDebugLevel(uint level)
|
||||||
{
|
{
|
||||||
Debug.SetDebugLevel(level);
|
Debug.SetDebugLevel(level);
|
||||||
|
|||||||
@@ -9,9 +9,6 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace PepperDash.Core.Logging
|
namespace PepperDash.Core.Logging
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a CrestronEnricher
|
|
||||||
/// </summary>
|
|
||||||
public class CrestronEnricher : ILogEventEnricher
|
public class CrestronEnricher : ILogEventEnricher
|
||||||
{
|
{
|
||||||
static readonly string _appName;
|
static readonly string _appName;
|
||||||
@@ -30,9 +27,6 @@ namespace PepperDash.Core.Logging
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Enrich method
|
|
||||||
/// </summary>
|
|
||||||
public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
|
public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
|
||||||
{
|
{
|
||||||
var property = propertyFactory.CreateProperty("App", _appName);
|
var property = propertyFactory.CreateProperty("App", _appName);
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
using System;
|
using Crestron.SimplSharp;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Reflection;
|
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using Crestron.SimplSharp;
|
|
||||||
using Crestron.SimplSharp.CrestronDataStore;
|
using Crestron.SimplSharp.CrestronDataStore;
|
||||||
using Crestron.SimplSharp.CrestronIO;
|
using Crestron.SimplSharp.CrestronIO;
|
||||||
using Crestron.SimplSharp.CrestronLogger;
|
using Crestron.SimplSharp.CrestronLogger;
|
||||||
@@ -15,6 +11,10 @@ using Serilog.Events;
|
|||||||
using Serilog.Formatting.Compact;
|
using Serilog.Formatting.Compact;
|
||||||
using Serilog.Formatting.Json;
|
using Serilog.Formatting.Json;
|
||||||
using Serilog.Templates;
|
using Serilog.Templates;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
|
||||||
namespace PepperDash.Core
|
namespace PepperDash.Core
|
||||||
{
|
{
|
||||||
@@ -48,9 +48,6 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
private static readonly LoggingLevelSwitch _fileLevelSwitch;
|
private static readonly LoggingLevelSwitch _fileLevelSwitch;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the minimum log level for the websocket sink.
|
|
||||||
/// </summary>
|
|
||||||
public static LogEventLevel WebsocketMinimumLogLevel
|
public static LogEventLevel WebsocketMinimumLogLevel
|
||||||
{
|
{
|
||||||
get { return _websocketLoggingLevelSwitch.MinimumLevel; }
|
get { return _websocketLoggingLevelSwitch.MinimumLevel; }
|
||||||
@@ -58,9 +55,6 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
private static readonly DebugWebsocketSink _websocketSink;
|
private static readonly DebugWebsocketSink _websocketSink;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the websocket sink for debug logging.
|
|
||||||
/// </summary>
|
|
||||||
public static DebugWebsocketSink WebsocketSink
|
public static DebugWebsocketSink WebsocketSink
|
||||||
{
|
{
|
||||||
get { return _websocketSink; }
|
get { return _websocketSink; }
|
||||||
@@ -84,12 +78,12 @@ namespace PepperDash.Core
|
|||||||
public static string FileName = string.Format(@"app{0}Debug.json", InitialParametersClass.ApplicationNumber);
|
public static string FileName = string.Format(@"app{0}Debug.json", InitialParametersClass.ApplicationNumber);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Level
|
/// Debug level to set for a given program.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static int Level { get; private set; }
|
public static int Level { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the DoNotLoadConfigOnNextBoot
|
/// When this is true, the configuration file will NOT be loaded until triggered by either a console command or a signal
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static bool DoNotLoadConfigOnNextBoot { get; private set; }
|
public static bool DoNotLoadConfigOnNextBoot { get; private set; }
|
||||||
|
|
||||||
@@ -97,33 +91,29 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
private const int SaveTimeoutMs = 30000;
|
private const int SaveTimeoutMs = 30000;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Indicates whether the system is running on an appliance.
|
|
||||||
/// </summary>
|
|
||||||
public static bool IsRunningOnAppliance = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance;
|
public static bool IsRunningOnAppliance = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the PepperDashCoreVersion
|
/// Version for the currently loaded PepperDashCore dll
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static string PepperDashCoreVersion { get; private set; }
|
public static string PepperDashCoreVersion { get; private set; }
|
||||||
|
|
||||||
private static CTimer _saveTimer;
|
private static CTimer _saveTimer;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// When true, the IncludedExcludedKeys dict will contain keys to include.
|
/// When true, the IncludedExcludedKeys dict will contain keys to include.
|
||||||
/// When false (default), IncludedExcludedKeys will contain keys to exclude.
|
/// When false (default), IncludedExcludedKeys will contain keys to exclude.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static bool _excludeAllMode;
|
private static bool _excludeAllMode;
|
||||||
|
|
||||||
private static readonly Dictionary<string, object> IncludedExcludedKeys;
|
//static bool ExcludeNoKeyMessages;
|
||||||
|
|
||||||
|
private static readonly Dictionary<string, object> IncludedExcludedKeys;
|
||||||
|
|
||||||
private static readonly LoggerConfiguration _defaultLoggerConfiguration;
|
private static readonly LoggerConfiguration _defaultLoggerConfiguration;
|
||||||
|
|
||||||
private static LoggerConfiguration _loggerConfiguration;
|
private static LoggerConfiguration _loggerConfiguration;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the logger configuration for the debug logging.
|
|
||||||
/// </summary>
|
|
||||||
public static LoggerConfiguration LoggerConfiguration => _loggerConfiguration;
|
public static LoggerConfiguration LoggerConfiguration => _loggerConfiguration;
|
||||||
|
|
||||||
static Debug()
|
static Debug()
|
||||||
@@ -138,7 +128,7 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
var defaultFileLogLevel = GetStoredLogEventLevel(FileLevelStoreKey);
|
var defaultFileLogLevel = GetStoredLogEventLevel(FileLevelStoreKey);
|
||||||
|
|
||||||
_consoleLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultConsoleLevel);
|
_consoleLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultConsoleLevel);
|
||||||
|
|
||||||
_websocketLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultWebsocketLevel);
|
_websocketLoggingLevelSwitch = new LoggingLevelSwitch(initialMinimumLevel: defaultWebsocketLevel);
|
||||||
|
|
||||||
@@ -154,7 +144,7 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
CrestronConsole.PrintLine($"Saving log files to {logFilePath}");
|
CrestronConsole.PrintLine($"Saving log files to {logFilePath}");
|
||||||
|
|
||||||
var errorLogTemplate = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance
|
var errorLogTemplate = CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance
|
||||||
? "{@t:fff}ms [{@l:u4}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}"
|
? "{@t:fff}ms [{@l:u4}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}"
|
||||||
: "[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}";
|
: "[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}";
|
||||||
|
|
||||||
@@ -165,7 +155,7 @@ namespace PepperDash.Core
|
|||||||
.WriteTo.Sink(new DebugConsoleSink(new ExpressionTemplate("[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}")), levelSwitch: _consoleLoggingLevelSwitch)
|
.WriteTo.Sink(new DebugConsoleSink(new ExpressionTemplate("[{@t:yyyy-MM-dd HH:mm:ss.fff}][{@l:u4}][{App}]{#if Key is not null}[{Key}]{#end} {@m}{#if @x is not null}\r\n{@x}{#end}")), levelSwitch: _consoleLoggingLevelSwitch)
|
||||||
.WriteTo.Sink(_websocketSink, levelSwitch: _websocketLoggingLevelSwitch)
|
.WriteTo.Sink(_websocketSink, levelSwitch: _websocketLoggingLevelSwitch)
|
||||||
.WriteTo.Sink(new DebugErrorLogSink(new ExpressionTemplate(errorLogTemplate)), levelSwitch: _errorLogLevelSwitch)
|
.WriteTo.Sink(new DebugErrorLogSink(new ExpressionTemplate(errorLogTemplate)), levelSwitch: _errorLogLevelSwitch)
|
||||||
.WriteTo.File(new RenderedCompactJsonFormatter(), logFilePath,
|
.WriteTo.File(new RenderedCompactJsonFormatter(), logFilePath,
|
||||||
rollingInterval: RollingInterval.Day,
|
rollingInterval: RollingInterval.Day,
|
||||||
restrictedToMinimumLevel: LogEventLevel.Debug,
|
restrictedToMinimumLevel: LogEventLevel.Debug,
|
||||||
retainedFileCountLimit: CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? 30 : 60,
|
retainedFileCountLimit: CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance ? 30 : 60,
|
||||||
@@ -203,27 +193,27 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
CrestronConsole.PrintLine(msg);
|
CrestronConsole.PrintLine(msg);
|
||||||
|
|
||||||
LogMessage(LogEventLevel.Information, msg);
|
LogMessage(LogEventLevel.Information,msg);
|
||||||
|
|
||||||
IncludedExcludedKeys = new Dictionary<string, object>();
|
|
||||||
|
|
||||||
|
IncludedExcludedKeys = new Dictionary<string, object>();
|
||||||
|
|
||||||
if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SimplSharpPro)
|
if (CrestronEnvironment.RuntimeEnvironment == eRuntimeEnvironment.SimplSharpPro)
|
||||||
{
|
{
|
||||||
// Add command to console
|
// Add command to console
|
||||||
CrestronConsole.AddNewConsoleCommand(SetDoNotLoadOnNextBootFromConsole, "donotloadonnextboot",
|
CrestronConsole.AddNewConsoleCommand(SetDoNotLoadOnNextBootFromConsole, "donotloadonnextboot",
|
||||||
"donotloadonnextboot:P [true/false]: Should the application load on next boot", ConsoleAccessLevelEnum.AccessOperator);
|
"donotloadonnextboot:P [true/false]: Should the application load on next boot", ConsoleAccessLevelEnum.AccessOperator);
|
||||||
|
|
||||||
CrestronConsole.AddNewConsoleCommand(SetDebugFromConsole, "appdebug",
|
CrestronConsole.AddNewConsoleCommand(SetDebugFromConsole, "appdebug",
|
||||||
"appdebug:P [0-5]: Sets the application's console debug message level",
|
"appdebug:P [0-5]: Sets the application's console debug message level",
|
||||||
ConsoleAccessLevelEnum.AccessOperator);
|
ConsoleAccessLevelEnum.AccessOperator);
|
||||||
CrestronConsole.AddNewConsoleCommand(ShowDebugLog, "appdebuglog",
|
CrestronConsole.AddNewConsoleCommand(ShowDebugLog, "appdebuglog",
|
||||||
"appdebuglog:P [all] Use \"all\" for full log.",
|
"appdebuglog:P [all] Use \"all\" for full log.",
|
||||||
ConsoleAccessLevelEnum.AccessOperator);
|
ConsoleAccessLevelEnum.AccessOperator);
|
||||||
CrestronConsole.AddNewConsoleCommand(s => CrestronLogger.Clear(false), "appdebugclear",
|
CrestronConsole.AddNewConsoleCommand(s => CrestronLogger.Clear(false), "appdebugclear",
|
||||||
"appdebugclear:P Clears the current custom log",
|
"appdebugclear:P Clears the current custom log",
|
||||||
ConsoleAccessLevelEnum.AccessOperator);
|
ConsoleAccessLevelEnum.AccessOperator);
|
||||||
CrestronConsole.AddNewConsoleCommand(SetDebugFilterFromConsole, "appdebugfilter",
|
CrestronConsole.AddNewConsoleCommand(SetDebugFilterFromConsole, "appdebugfilter",
|
||||||
"appdebugfilter [params]", ConsoleAccessLevelEnum.AccessOperator);
|
"appdebugfilter [params]", ConsoleAccessLevelEnum.AccessOperator);
|
||||||
}
|
}
|
||||||
|
|
||||||
CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
|
CrestronEnvironment.ProgramStatusEventHandler += CrestronEnvironment_ProgramStatusEventHandler;
|
||||||
@@ -234,7 +224,7 @@ namespace PepperDash.Core
|
|||||||
Level = context.Level;
|
Level = context.Level;
|
||||||
DoNotLoadConfigOnNextBoot = context.DoNotLoadOnNextBoot;
|
DoNotLoadConfigOnNextBoot = context.DoNotLoadOnNextBoot;
|
||||||
|
|
||||||
if (DoNotLoadConfigOnNextBoot)
|
if(DoNotLoadConfigOnNextBoot)
|
||||||
CrestronConsole.PrintLine(string.Format("Program {0} will not load config after next boot. Use console command go:{0} to load the config manually", InitialParametersClass.ApplicationNumber));
|
CrestronConsole.PrintLine(string.Format("Program {0} will not load config after next boot. Use console command go:{0} to load the config manually", InitialParametersClass.ApplicationNumber));
|
||||||
|
|
||||||
_consoleLoggingLevelSwitch.MinimumLevelChanged += (sender, args) =>
|
_consoleLoggingLevelSwitch.MinimumLevelChanged += (sender, args) =>
|
||||||
@@ -243,9 +233,6 @@ namespace PepperDash.Core
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// UpdateLoggerConfiguration method
|
|
||||||
/// </summary>
|
|
||||||
public static void UpdateLoggerConfiguration(LoggerConfiguration config)
|
public static void UpdateLoggerConfiguration(LoggerConfiguration config)
|
||||||
{
|
{
|
||||||
_loggerConfiguration = config;
|
_loggerConfiguration = config;
|
||||||
@@ -253,9 +240,6 @@ namespace PepperDash.Core
|
|||||||
_logger = config.CreateLogger();
|
_logger = config.CreateLogger();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ResetLoggerConfiguration method
|
|
||||||
/// </summary>
|
|
||||||
public static void ResetLoggerConfiguration()
|
public static void ResetLoggerConfiguration()
|
||||||
{
|
{
|
||||||
_loggerConfiguration = _defaultLoggerConfiguration;
|
_loggerConfiguration = _defaultLoggerConfiguration;
|
||||||
@@ -267,7 +251,7 @@ namespace PepperDash.Core
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var result = CrestronDataStoreStatic.GetLocalIntValue(levelStoreKey, out int logLevel);
|
var result = CrestronDataStoreStatic.GetLocalIntValue(levelStoreKey, out int logLevel);
|
||||||
|
|
||||||
if (result != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
|
if (result != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
|
||||||
{
|
{
|
||||||
@@ -275,15 +259,14 @@ namespace PepperDash.Core
|
|||||||
return LogEventLevel.Information;
|
return LogEventLevel.Information;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (logLevel < 0 || logLevel > 5)
|
if(logLevel < 0 || logLevel > 5)
|
||||||
{
|
{
|
||||||
CrestronConsole.PrintLine($"Stored Log level not valid for {levelStoreKey}: {logLevel}. Setting level to {LogEventLevel.Information}");
|
CrestronConsole.PrintLine($"Stored Log level not valid for {levelStoreKey}: {logLevel}. Setting level to {LogEventLevel.Information}");
|
||||||
return LogEventLevel.Information;
|
return LogEventLevel.Information;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (LogEventLevel)logLevel;
|
return (LogEventLevel)logLevel;
|
||||||
}
|
} catch (Exception ex)
|
||||||
catch (Exception ex)
|
|
||||||
{
|
{
|
||||||
CrestronConsole.PrintLine($"Exception retrieving log level for {levelStoreKey}: {ex.Message}");
|
CrestronConsole.PrintLine($"Exception retrieving log level for {levelStoreKey}: {ex.Message}");
|
||||||
return LogEventLevel.Information;
|
return LogEventLevel.Information;
|
||||||
@@ -295,7 +278,7 @@ namespace PepperDash.Core
|
|||||||
var assembly = Assembly.GetExecutingAssembly();
|
var assembly = Assembly.GetExecutingAssembly();
|
||||||
var ver =
|
var ver =
|
||||||
assembly
|
assembly
|
||||||
.GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false);
|
.GetCustomAttributes(typeof (AssemblyInformationalVersionAttribute), false);
|
||||||
|
|
||||||
if (ver != null && ver.Length > 0)
|
if (ver != null && ver.Length > 0)
|
||||||
{
|
{
|
||||||
@@ -336,9 +319,6 @@ namespace PepperDash.Core
|
|||||||
/// Callback for console command
|
/// Callback for console command
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="levelString"></param>
|
/// <param name="levelString"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetDebugFromConsole method
|
|
||||||
/// </summary>
|
|
||||||
public static void SetDebugFromConsole(string levelString)
|
public static void SetDebugFromConsole(string levelString)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -362,25 +342,25 @@ namespace PepperDash.Core
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (int.TryParse(levelString, out var levelInt))
|
if(int.TryParse(levelString, out var levelInt))
|
||||||
{
|
{
|
||||||
if (levelInt < 0 || levelInt > 5)
|
if(levelInt < 0 || levelInt > 5)
|
||||||
{
|
{
|
||||||
CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelString} to valid log level. If using a number, value must be between 0-5");
|
CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelString} to valid log level. If using a number, value must be between 0-5");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
SetDebugLevel((uint)levelInt);
|
SetDebugLevel((uint) levelInt);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Enum.TryParse<LogEventLevel>(levelString, out var levelEnum))
|
if(Enum.TryParse<LogEventLevel>(levelString, out var levelEnum))
|
||||||
{
|
{
|
||||||
SetDebugLevel(levelEnum);
|
SetDebugLevel(levelEnum);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelString} to valid log level");
|
CrestronConsole.ConsoleCommandResponse($"Error: Unable to parse {levelString} to valid log level");
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
CrestronConsole.ConsoleCommandResponse("Usage: appdebug:P [0-5]");
|
CrestronConsole.ConsoleCommandResponse("Usage: appdebug:P [0-5]");
|
||||||
@@ -391,12 +371,9 @@ namespace PepperDash.Core
|
|||||||
/// Sets the debug level
|
/// Sets the debug level
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="level"> Valid values 0-5</param>
|
/// <param name="level"> Valid values 0-5</param>
|
||||||
/// <summary>
|
|
||||||
/// SetDebugLevel method
|
|
||||||
/// </summary>
|
|
||||||
public static void SetDebugLevel(uint level)
|
public static void SetDebugLevel(uint level)
|
||||||
{
|
{
|
||||||
if (!_logLevels.TryGetValue(level, out var logLevel))
|
if(!_logLevels.TryGetValue(level, out var logLevel))
|
||||||
{
|
{
|
||||||
logLevel = LogEventLevel.Information;
|
logLevel = LogEventLevel.Information;
|
||||||
|
|
||||||
@@ -408,9 +385,6 @@ namespace PepperDash.Core
|
|||||||
SetDebugLevel(logLevel);
|
SetDebugLevel(logLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// SetDebugLevel method
|
|
||||||
/// </summary>
|
|
||||||
public static void SetDebugLevel(LogEventLevel level)
|
public static void SetDebugLevel(LogEventLevel level)
|
||||||
{
|
{
|
||||||
_consoleLoggingLevelSwitch.MinimumLevel = level;
|
_consoleLoggingLevelSwitch.MinimumLevel = level;
|
||||||
@@ -418,9 +392,9 @@ namespace PepperDash.Core
|
|||||||
CrestronConsole.ConsoleCommandResponse("[Application {0}], Debug level set to {1}\r\n",
|
CrestronConsole.ConsoleCommandResponse("[Application {0}], Debug level set to {1}\r\n",
|
||||||
InitialParametersClass.ApplicationNumber, _consoleLoggingLevelSwitch.MinimumLevel);
|
InitialParametersClass.ApplicationNumber, _consoleLoggingLevelSwitch.MinimumLevel);
|
||||||
|
|
||||||
CrestronConsole.ConsoleCommandResponse($"Storing level {level}:{(int)level}");
|
CrestronConsole.ConsoleCommandResponse($"Storing level {level}:{(int) level}");
|
||||||
|
|
||||||
var err = CrestronDataStoreStatic.SetLocalIntValue(LevelStoreKey, (int)level);
|
var err = CrestronDataStoreStatic.SetLocalIntValue(LevelStoreKey, (int) level);
|
||||||
|
|
||||||
CrestronConsole.ConsoleCommandResponse($"Store result: {err}:{(int)level}");
|
CrestronConsole.ConsoleCommandResponse($"Store result: {err}:{(int)level}");
|
||||||
|
|
||||||
@@ -428,14 +402,11 @@ namespace PepperDash.Core
|
|||||||
CrestronConsole.PrintLine($"Error saving console debug level setting: {err}");
|
CrestronConsole.PrintLine($"Error saving console debug level setting: {err}");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// SetWebSocketMinimumDebugLevel method
|
|
||||||
/// </summary>
|
|
||||||
public static void SetWebSocketMinimumDebugLevel(LogEventLevel level)
|
public static void SetWebSocketMinimumDebugLevel(LogEventLevel level)
|
||||||
{
|
{
|
||||||
_websocketLoggingLevelSwitch.MinimumLevel = level;
|
_websocketLoggingLevelSwitch.MinimumLevel = level;
|
||||||
|
|
||||||
var err = CrestronDataStoreStatic.SetLocalUintValue(WebSocketLevelStoreKey, (uint)level);
|
var err = CrestronDataStoreStatic.SetLocalUintValue(WebSocketLevelStoreKey, (uint) level);
|
||||||
|
|
||||||
if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
|
if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
|
||||||
LogMessage(LogEventLevel.Information, "Error saving websocket debug level setting: {erro}", err);
|
LogMessage(LogEventLevel.Information, "Error saving websocket debug level setting: {erro}", err);
|
||||||
@@ -443,9 +414,6 @@ namespace PepperDash.Core
|
|||||||
LogMessage(LogEventLevel.Information, "Websocket debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
|
LogMessage(LogEventLevel.Information, "Websocket debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// SetErrorLogMinimumDebugLevel method
|
|
||||||
/// </summary>
|
|
||||||
public static void SetErrorLogMinimumDebugLevel(LogEventLevel level)
|
public static void SetErrorLogMinimumDebugLevel(LogEventLevel level)
|
||||||
{
|
{
|
||||||
_errorLogLevelSwitch.MinimumLevel = level;
|
_errorLogLevelSwitch.MinimumLevel = level;
|
||||||
@@ -458,9 +426,6 @@ namespace PepperDash.Core
|
|||||||
LogMessage(LogEventLevel.Information, "Error log debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
|
LogMessage(LogEventLevel.Information, "Error log debug level set to {0}", _websocketLoggingLevelSwitch.MinimumLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// SetFileMinimumDebugLevel method
|
|
||||||
/// </summary>
|
|
||||||
public static void SetFileMinimumDebugLevel(LogEventLevel level)
|
public static void SetFileMinimumDebugLevel(LogEventLevel level)
|
||||||
{
|
{
|
||||||
_errorLogLevelSwitch.MinimumLevel = level;
|
_errorLogLevelSwitch.MinimumLevel = level;
|
||||||
@@ -477,9 +442,6 @@ namespace PepperDash.Core
|
|||||||
/// Callback for console command
|
/// Callback for console command
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="stateString"></param>
|
/// <param name="stateString"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetDoNotLoadOnNextBootFromConsole method
|
|
||||||
/// </summary>
|
|
||||||
public static void SetDoNotLoadOnNextBootFromConsole(string stateString)
|
public static void SetDoNotLoadOnNextBootFromConsole(string stateString)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -502,83 +464,80 @@ namespace PepperDash.Core
|
|||||||
/// Callback for console command
|
/// Callback for console command
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="items"></param>
|
/// <param name="items"></param>
|
||||||
/// <summary>
|
public static void SetDebugFilterFromConsole(string items)
|
||||||
/// SetDebugFilterFromConsole method
|
{
|
||||||
/// </summary>
|
var str = items.Trim();
|
||||||
public static void SetDebugFilterFromConsole(string items)
|
if (str == "?")
|
||||||
{
|
{
|
||||||
var str = items.Trim();
|
CrestronConsole.ConsoleCommandResponse("Usage:\r APPDEBUGFILTER key1 key2 key3....\r " +
|
||||||
if (str == "?")
|
"+all: at beginning puts filter into 'default include' mode\r" +
|
||||||
{
|
" All keys that follow will be excluded from output.\r" +
|
||||||
CrestronConsole.ConsoleCommandResponse("Usage:\r APPDEBUGFILTER key1 key2 key3....\r " +
|
"-all: at beginning puts filter into 'default exclude all' mode.\r" +
|
||||||
"+all: at beginning puts filter into 'default include' mode\r" +
|
" All keys that follow will be the only keys that are shown\r" +
|
||||||
" All keys that follow will be excluded from output.\r" +
|
"+nokey: Enables messages with no key (default)\r" +
|
||||||
"-all: at beginning puts filter into 'default exclude all' mode.\r" +
|
"-nokey: Disables messages with no key.\r" +
|
||||||
" All keys that follow will be the only keys that are shown\r" +
|
"(nokey settings are independent of all other settings)");
|
||||||
"+nokey: Enables messages with no key (default)\r" +
|
return;
|
||||||
"-nokey: Disables messages with no key.\r" +
|
}
|
||||||
"(nokey settings are independent of all other settings)");
|
var keys = Regex.Split(str, @"\s*");
|
||||||
return;
|
foreach (var keyToken in keys)
|
||||||
}
|
{
|
||||||
var keys = Regex.Split(str, @"\s*");
|
var lkey = keyToken.ToLower();
|
||||||
foreach (var keyToken in keys)
|
if (lkey == "+all")
|
||||||
{
|
{
|
||||||
var lkey = keyToken.ToLower();
|
IncludedExcludedKeys.Clear();
|
||||||
if (lkey == "+all")
|
_excludeAllMode = false;
|
||||||
{
|
}
|
||||||
IncludedExcludedKeys.Clear();
|
else if (lkey == "-all")
|
||||||
_excludeAllMode = false;
|
{
|
||||||
}
|
IncludedExcludedKeys.Clear();
|
||||||
else if (lkey == "-all")
|
_excludeAllMode = true;
|
||||||
{
|
}
|
||||||
IncludedExcludedKeys.Clear();
|
//else if (lkey == "+nokey")
|
||||||
_excludeAllMode = true;
|
//{
|
||||||
}
|
// ExcludeNoKeyMessages = false;
|
||||||
//else if (lkey == "+nokey")
|
//}
|
||||||
//{
|
//else if (lkey == "-nokey")
|
||||||
// ExcludeNoKeyMessages = false;
|
//{
|
||||||
//}
|
// ExcludeNoKeyMessages = true;
|
||||||
//else if (lkey == "-nokey")
|
//}
|
||||||
//{
|
else
|
||||||
// ExcludeNoKeyMessages = true;
|
{
|
||||||
//}
|
string key;
|
||||||
else
|
if (lkey.StartsWith("-"))
|
||||||
{
|
{
|
||||||
string key;
|
key = lkey.Substring(1);
|
||||||
if (lkey.StartsWith("-"))
|
// if in exclude all mode, we need to remove this from the inclusions
|
||||||
{
|
if (_excludeAllMode)
|
||||||
key = lkey.Substring(1);
|
{
|
||||||
// if in exclude all mode, we need to remove this from the inclusions
|
if (IncludedExcludedKeys.ContainsKey(key))
|
||||||
if (_excludeAllMode)
|
IncludedExcludedKeys.Remove(key);
|
||||||
{
|
}
|
||||||
if (IncludedExcludedKeys.ContainsKey(key))
|
// otherwise include all mode, add to the exclusions
|
||||||
IncludedExcludedKeys.Remove(key);
|
else
|
||||||
}
|
{
|
||||||
// otherwise include all mode, add to the exclusions
|
IncludedExcludedKeys[key] = new object();
|
||||||
else
|
}
|
||||||
{
|
}
|
||||||
IncludedExcludedKeys[key] = new object();
|
else if (lkey.StartsWith("+"))
|
||||||
}
|
{
|
||||||
}
|
key = lkey.Substring(1);
|
||||||
else if (lkey.StartsWith("+"))
|
// if in exclude all mode, we need to add this as inclusion
|
||||||
{
|
if (_excludeAllMode)
|
||||||
key = lkey.Substring(1);
|
{
|
||||||
// if in exclude all mode, we need to add this as inclusion
|
|
||||||
if (_excludeAllMode)
|
|
||||||
{
|
|
||||||
|
|
||||||
IncludedExcludedKeys[key] = new object();
|
IncludedExcludedKeys[key] = new object();
|
||||||
}
|
}
|
||||||
// otherwise include all mode, remove this from exclusions
|
// otherwise include all mode, remove this from exclusions
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (IncludedExcludedKeys.ContainsKey(key))
|
if (IncludedExcludedKeys.ContainsKey(key))
|
||||||
IncludedExcludedKeys.Remove(key);
|
IncludedExcludedKeys.Remove(key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -600,13 +559,10 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="deviceKey"></param>
|
/// <param name="deviceKey"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// GetDeviceDebugSettingsForKey method
|
|
||||||
/// </summary>
|
|
||||||
public static object GetDeviceDebugSettingsForKey(string deviceKey)
|
public static object GetDeviceDebugSettingsForKey(string deviceKey)
|
||||||
{
|
{
|
||||||
return _contexts.GetDebugSettingsForKey(deviceKey);
|
return _contexts.GetDebugSettingsForKey(deviceKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Sets the flag to prevent application starting on next boot
|
/// Sets the flag to prevent application starting on next boot
|
||||||
@@ -623,7 +579,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ShowDebugLog method
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static void ShowDebugLog(string s)
|
public static void ShowDebugLog(string s)
|
||||||
{
|
{
|
||||||
@@ -639,9 +595,6 @@ namespace PepperDash.Core
|
|||||||
/// <param name="message">Message template</param>
|
/// <param name="message">Message template</param>
|
||||||
/// <param name="device">Optional IKeyed device. If provided, the Key of the device will be added to the log message</param>
|
/// <param name="device">Optional IKeyed device. If provided, the Key of the device will be added to the log message</param>
|
||||||
/// <param name="args">Args to put into message template</param>
|
/// <param name="args">Args to put into message template</param>
|
||||||
/// <summary>
|
|
||||||
/// LogMessage method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogMessage(Exception ex, string message, IKeyed device = null, params object[] args)
|
public static void LogMessage(Exception ex, string message, IKeyed device = null, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", device?.Key))
|
using (LogContext.PushProperty("Key", device?.Key))
|
||||||
@@ -665,36 +618,21 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Logs a message at the specified log level.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="level">Level to log at</param>
|
|
||||||
/// <param name="message">Message template</param>
|
|
||||||
/// <param name="args">Args to put into message template</param>
|
|
||||||
public static void LogMessage(LogEventLevel level, string message, params object[] args)
|
public static void LogMessage(LogEventLevel level, string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(level, message, args);
|
_logger.Write(level, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogMessage method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogMessage(LogEventLevel level, Exception ex, string message, params object[] args)
|
public static void LogMessage(LogEventLevel level, Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(level, ex, message, args);
|
_logger.Write(level, ex, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogMessage method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogMessage(LogEventLevel level, IKeyed keyed, string message, params object[] args)
|
public static void LogMessage(LogEventLevel level, IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
LogMessage(level, message, keyed, args);
|
LogMessage(level, message, keyed, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogMessage method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogMessage(LogEventLevel level, Exception ex, IKeyed device, string message, params object[] args)
|
public static void LogMessage(LogEventLevel level, Exception ex, IKeyed device, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", device?.Key))
|
using (LogContext.PushProperty("Key", device?.Key))
|
||||||
@@ -704,47 +642,32 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
#region Explicit methods for logging levels
|
#region Explicit methods for logging levels
|
||||||
/// <summary>
|
|
||||||
/// LogVerbose method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogVerbose(IKeyed keyed, string message, params object[] args)
|
public static void LogVerbose(IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using(LogContext.PushProperty("Key", keyed?.Key))
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Verbose, message, args);
|
_logger.Write(LogEventLevel.Verbose, message, args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogVerbose method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogVerbose(Exception ex, IKeyed keyed, string message, params object[] args)
|
public static void LogVerbose(Exception ex, IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using(LogContext.PushProperty("Key", keyed?.Key))
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Verbose, ex, message, args);
|
_logger.Write(LogEventLevel.Verbose, ex, message, args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogVerbose method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogVerbose(string message, params object[] args)
|
public static void LogVerbose(string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Verbose, message, args);
|
_logger.Write(LogEventLevel.Verbose, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogVerbose method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogVerbose(Exception ex, string message, params object[] args)
|
public static void LogVerbose(Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Verbose, ex, message, args);
|
_logger.Write(LogEventLevel.Verbose, ex, null, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogDebug method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogDebug(IKeyed keyed, string message, params object[] args)
|
public static void LogDebug(IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using (LogContext.PushProperty("Key", keyed?.Key))
|
||||||
@@ -753,9 +676,6 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogDebug method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogDebug(Exception ex, IKeyed keyed, string message, params object[] args)
|
public static void LogDebug(Exception ex, IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using (LogContext.PushProperty("Key", keyed?.Key))
|
||||||
@@ -764,25 +684,16 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogDebug method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogDebug(string message, params object[] args)
|
public static void LogDebug(string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Debug, message, args);
|
_logger.Write(LogEventLevel.Debug, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogDebug method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogDebug(Exception ex, string message, params object[] args)
|
public static void LogDebug(Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Debug, ex, null, message, args);
|
_logger.Write(LogEventLevel.Debug, ex, null, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogInformation method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogInformation(IKeyed keyed, string message, params object[] args)
|
public static void LogInformation(IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using (LogContext.PushProperty("Key", keyed?.Key))
|
||||||
@@ -791,9 +702,6 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogInformation method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogInformation(Exception ex, IKeyed keyed, string message, params object[] args)
|
public static void LogInformation(Exception ex, IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using (LogContext.PushProperty("Key", keyed?.Key))
|
||||||
@@ -802,25 +710,16 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogInformation method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogInformation(string message, params object[] args)
|
public static void LogInformation(string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Information, message, args);
|
_logger.Write(LogEventLevel.Information, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogInformation method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogInformation(Exception ex, string message, params object[] args)
|
public static void LogInformation(Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Information, ex, message, args);
|
_logger.Write(LogEventLevel.Information, ex, null, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogWarning method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogWarning(IKeyed keyed, string message, params object[] args)
|
public static void LogWarning(IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using (LogContext.PushProperty("Key", keyed?.Key))
|
||||||
@@ -829,9 +728,6 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogWarning method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogWarning(Exception ex, IKeyed keyed, string message, params object[] args)
|
public static void LogWarning(Exception ex, IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using (LogContext.PushProperty("Key", keyed?.Key))
|
||||||
@@ -840,25 +736,16 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogWarning method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogWarning(string message, params object[] args)
|
public static void LogWarning(string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Warning, message, args);
|
_logger.Write(LogEventLevel.Warning, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogWarning method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogWarning(Exception ex, string message, params object[] args)
|
public static void LogWarning(Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Warning, ex, message, args);
|
_logger.Write(LogEventLevel.Warning, ex, null, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogError method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogError(IKeyed keyed, string message, params object[] args)
|
public static void LogError(IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using (LogContext.PushProperty("Key", keyed?.Key))
|
||||||
@@ -867,9 +754,6 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogError method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogError(Exception ex, IKeyed keyed, string message, params object[] args)
|
public static void LogError(Exception ex, IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using (LogContext.PushProperty("Key", keyed?.Key))
|
||||||
@@ -878,25 +762,16 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogError method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogError(string message, params object[] args)
|
public static void LogError(string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Error, message, args);
|
_logger.Write(LogEventLevel.Error, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogError method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogError(Exception ex, string message, params object[] args)
|
public static void LogError(Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Error, ex, message, args);
|
_logger.Write(LogEventLevel.Error, ex, null, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogFatal method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogFatal(IKeyed keyed, string message, params object[] args)
|
public static void LogFatal(IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using (LogContext.PushProperty("Key", keyed?.Key))
|
||||||
@@ -905,9 +780,6 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogFatal method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogFatal(Exception ex, IKeyed keyed, string message, params object[] args)
|
public static void LogFatal(Exception ex, IKeyed keyed, string message, params object[] args)
|
||||||
{
|
{
|
||||||
using (LogContext.PushProperty("Key", keyed?.Key))
|
using (LogContext.PushProperty("Key", keyed?.Key))
|
||||||
@@ -916,20 +788,14 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogFatal method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogFatal(string message, params object[] args)
|
public static void LogFatal(string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Fatal, message, args);
|
_logger.Write(LogEventLevel.Fatal, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogFatal method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogFatal(Exception ex, string message, params object[] args)
|
public static void LogFatal(Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
_logger.Write(LogEventLevel.Fatal, ex, message, args);
|
_logger.Write(LogEventLevel.Fatal, ex, null, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
@@ -940,7 +806,7 @@ namespace PepperDash.Core
|
|||||||
if (!_logLevels.ContainsKey(level)) return;
|
if (!_logLevels.ContainsKey(level)) return;
|
||||||
|
|
||||||
var logLevel = _logLevels[level];
|
var logLevel = _logLevels[level];
|
||||||
|
|
||||||
LogMessage(logLevel, format, items);
|
LogMessage(logLevel, format, items);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -995,7 +861,7 @@ namespace PepperDash.Core
|
|||||||
[Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
|
[Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
|
||||||
public static void Console(uint level, IKeyed dev, ErrorLogLevel errorLogLevel,
|
public static void Console(uint level, IKeyed dev, ErrorLogLevel errorLogLevel,
|
||||||
string format, params object[] items)
|
string format, params object[] items)
|
||||||
{
|
{
|
||||||
LogMessage(level, dev, format, items);
|
LogMessage(level, dev, format, items);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1003,9 +869,6 @@ namespace PepperDash.Core
|
|||||||
/// Logs to Console when at-level, and all messages to error log
|
/// Logs to Console when at-level, and all messages to error log
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
|
[Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
|
||||||
/// <summary>
|
|
||||||
/// Console method
|
|
||||||
/// </summary>
|
|
||||||
public static void Console(uint level, ErrorLogLevel errorLogLevel,
|
public static void Console(uint level, ErrorLogLevel errorLogLevel,
|
||||||
string format, params object[] items)
|
string format, params object[] items)
|
||||||
{
|
{
|
||||||
@@ -1018,9 +881,6 @@ namespace PepperDash.Core
|
|||||||
/// it will only be written to the log.
|
/// it will only be written to the log.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
|
[Obsolete("Use LogMessage methods, Will be removed in 2.2.0 and later versions")]
|
||||||
/// <summary>
|
|
||||||
/// ConsoleWithLog method
|
|
||||||
/// </summary>
|
|
||||||
public static void ConsoleWithLog(uint level, string format, params object[] items)
|
public static void ConsoleWithLog(uint level, string format, params object[] items)
|
||||||
{
|
{
|
||||||
LogMessage(level, format, items);
|
LogMessage(level, format, items);
|
||||||
@@ -1139,26 +999,26 @@ namespace PepperDash.Core
|
|||||||
return string.Format(@"\user\debugSettings\program{0}", InitialParametersClass.ApplicationNumber);
|
return string.Format(@"\user\debugSettings\program{0}", InitialParametersClass.ApplicationNumber);
|
||||||
}
|
}
|
||||||
|
|
||||||
return string.Format("{0}{1}user{1}debugSettings{1}{2}.json", Directory.GetApplicationRootDirectory(), Path.DirectorySeparatorChar, InitialParametersClass.RoomId);
|
return string.Format("{0}{1}user{1}debugSettings{1}{2}.json",Directory.GetApplicationRootDirectory(), Path.DirectorySeparatorChar, InitialParametersClass.RoomId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Enumeration of ErrorLogLevel values
|
/// Error level to for message to be logged at
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public enum ErrorLogLevel
|
public enum ErrorLogLevel
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Error
|
/// Error
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Error,
|
Error,
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Warning
|
/// Warning
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Warning,
|
Warning,
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Notice
|
/// Notice
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Notice,
|
Notice,
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// None
|
/// None
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -11,16 +11,10 @@ using System.Text;
|
|||||||
|
|
||||||
namespace PepperDash.Core
|
namespace PepperDash.Core
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a DebugConsoleSink
|
|
||||||
/// </summary>
|
|
||||||
public class DebugConsoleSink : ILogEventSink
|
public class DebugConsoleSink : ILogEventSink
|
||||||
{
|
{
|
||||||
private readonly ITextFormatter _textFormatter;
|
private readonly ITextFormatter _textFormatter;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Emit method
|
|
||||||
/// </summary>
|
|
||||||
public void Emit(LogEvent logEvent)
|
public void Emit(LogEvent logEvent)
|
||||||
{
|
{
|
||||||
if (!Debug.IsRunningOnAppliance) return;
|
if (!Debug.IsRunningOnAppliance) return;
|
||||||
@@ -50,9 +44,6 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
public static class DebugConsoleSinkExtensions
|
public static class DebugConsoleSinkExtensions
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// DebugConsoleSink method
|
|
||||||
/// </summary>
|
|
||||||
public static LoggerConfiguration DebugConsoleSink(
|
public static LoggerConfiguration DebugConsoleSink(
|
||||||
this LoggerSinkConfiguration loggerConfiguration,
|
this LoggerSinkConfiguration loggerConfiguration,
|
||||||
ITextFormatter formatProvider = null)
|
ITextFormatter formatProvider = null)
|
||||||
|
|||||||
@@ -19,9 +19,9 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string Key { get; private set; }
|
public string Key { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
///// <summary>
|
||||||
/// The name of the file containing the current debug settings.
|
///// The name of the file containing the current debug settings.
|
||||||
/// </summary>
|
///// </summary>
|
||||||
//string FileName = string.Format(@"\nvram\debug\app{0}Debug.json", InitialParametersClass.ApplicationNumber);
|
//string FileName = string.Format(@"\nvram\debug\app{0}Debug.json", InitialParametersClass.ApplicationNumber);
|
||||||
|
|
||||||
DebugContextSaveData SaveData;
|
DebugContextSaveData SaveData;
|
||||||
@@ -38,9 +38,6 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// GetDebugContext method
|
|
||||||
/// </summary>
|
|
||||||
public static DebugContext GetDebugContext(string key)
|
public static DebugContext GetDebugContext(string key)
|
||||||
{
|
{
|
||||||
var context = Contexts.FirstOrDefault(c => c.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
|
var context = Contexts.FirstOrDefault(c => c.Key.Equals(key, StringComparison.OrdinalIgnoreCase));
|
||||||
@@ -95,9 +92,6 @@ namespace PepperDash.Core
|
|||||||
/// Callback for console command
|
/// Callback for console command
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="levelString"></param>
|
/// <param name="levelString"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetDebugFromConsole method
|
|
||||||
/// </summary>
|
|
||||||
public void SetDebugFromConsole(string levelString)
|
public void SetDebugFromConsole(string levelString)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -120,9 +114,6 @@ namespace PepperDash.Core
|
|||||||
/// Sets the debug level
|
/// Sets the debug level
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="level"> Valid values 0 (no debug), 1 (critical), 2 (all messages)</param>
|
/// <param name="level"> Valid values 0 (no debug), 1 (critical), 2 (all messages)</param>
|
||||||
/// <summary>
|
|
||||||
/// SetDebugLevel method
|
|
||||||
/// </summary>
|
|
||||||
public void SetDebugLevel(int level)
|
public void SetDebugLevel(int level)
|
||||||
{
|
{
|
||||||
if (level <= 2)
|
if (level <= 2)
|
||||||
@@ -150,7 +141,7 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Console method
|
/// Appends a device Key to the beginning of a message
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Console(uint level, IKeyed dev, string format, params object[] items)
|
public void Console(uint level, IKeyed dev, string format, params object[] items)
|
||||||
{
|
{
|
||||||
@@ -200,9 +191,6 @@ namespace PepperDash.Core
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="errorLogLevel"></param>
|
/// <param name="errorLogLevel"></param>
|
||||||
/// <param name="str"></param>
|
/// <param name="str"></param>
|
||||||
/// <summary>
|
|
||||||
/// LogError method
|
|
||||||
/// </summary>
|
|
||||||
public void LogError(Debug.ErrorLogLevel errorLogLevel, string str)
|
public void LogError(Debug.ErrorLogLevel errorLogLevel, string str)
|
||||||
{
|
{
|
||||||
string msg = string.Format("App {0}:{1}", InitialParametersClass.ApplicationNumber, str);
|
string msg = string.Format("App {0}:{1}", InitialParametersClass.ApplicationNumber, str);
|
||||||
|
|||||||
@@ -5,14 +5,8 @@ using Serilog.Events;
|
|||||||
|
|
||||||
namespace PepperDash.Core.Logging
|
namespace PepperDash.Core.Logging
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a DebugCrestronLoggerSink
|
|
||||||
/// </summary>
|
|
||||||
public class DebugCrestronLoggerSink : ILogEventSink
|
public class DebugCrestronLoggerSink : ILogEventSink
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Emit method
|
|
||||||
/// </summary>
|
|
||||||
public void Emit(LogEvent logEvent)
|
public void Emit(LogEvent logEvent)
|
||||||
{
|
{
|
||||||
if (!Debug.IsRunningOnAppliance) return;
|
if (!Debug.IsRunningOnAppliance) return;
|
||||||
|
|||||||
@@ -11,9 +11,6 @@ using System.Threading.Tasks;
|
|||||||
|
|
||||||
namespace PepperDash.Core.Logging
|
namespace PepperDash.Core.Logging
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a DebugErrorLogSink
|
|
||||||
/// </summary>
|
|
||||||
public class DebugErrorLogSink : ILogEventSink
|
public class DebugErrorLogSink : ILogEventSink
|
||||||
{
|
{
|
||||||
private ITextFormatter _formatter;
|
private ITextFormatter _formatter;
|
||||||
@@ -27,9 +24,6 @@ namespace PepperDash.Core.Logging
|
|||||||
{LogEventLevel.Error, (msg) => ErrorLog.Error(msg) },
|
{LogEventLevel.Error, (msg) => ErrorLog.Error(msg) },
|
||||||
{LogEventLevel.Fatal, (msg) => ErrorLog.Error(msg) }
|
{LogEventLevel.Fatal, (msg) => ErrorLog.Error(msg) }
|
||||||
};
|
};
|
||||||
/// <summary>
|
|
||||||
/// Emit method
|
|
||||||
/// </summary>
|
|
||||||
public void Emit(LogEvent logEvent)
|
public void Emit(LogEvent logEvent)
|
||||||
{
|
{
|
||||||
string message;
|
string message;
|
||||||
|
|||||||
@@ -6,105 +6,66 @@ namespace PepperDash.Core.Logging
|
|||||||
{
|
{
|
||||||
public static class DebugExtensions
|
public static class DebugExtensions
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// LogException method
|
|
||||||
/// </summary>
|
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogVerbose method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogVerbose(this IKeyed device, Exception ex, string message, params object[] args)
|
public static void LogVerbose(this IKeyed device, Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Verbose, ex, message, device, args);
|
Log.LogMessage(LogEventLevel.Verbose, ex, message, device, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogVerbose method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogVerbose(this IKeyed device, string message, params object[] args)
|
public static void LogVerbose(this IKeyed device, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Verbose, device, message, args);
|
Log.LogMessage(LogEventLevel.Verbose, device, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogDebug method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogDebug(this IKeyed device, Exception ex, string message, params object[] args)
|
public static void LogDebug(this IKeyed device, Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Debug, ex, message, device, args);
|
Log.LogMessage(LogEventLevel.Debug, ex, message, device, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogDebug method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogDebug(this IKeyed device, string message, params object[] args)
|
public static void LogDebug(this IKeyed device, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Debug, device, message, args);
|
Log.LogMessage(LogEventLevel.Debug, device, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogInformation method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogInformation(this IKeyed device, Exception ex, string message, params object[] args)
|
public static void LogInformation(this IKeyed device, Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Information, ex, message, device, args);
|
Log.LogMessage(LogEventLevel.Information, ex, message, device, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogInformation method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogInformation(this IKeyed device, string message, params object[] args)
|
public static void LogInformation(this IKeyed device, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Information, device, message, args);
|
Log.LogMessage(LogEventLevel.Information, device, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogWarning method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogWarning(this IKeyed device, Exception ex, string message, params object[] args)
|
public static void LogWarning(this IKeyed device, Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Warning, ex, message, device, args);
|
Log.LogMessage(LogEventLevel.Warning, ex, message, device, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogWarning method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogWarning(this IKeyed device, string message, params object[] args)
|
public static void LogWarning(this IKeyed device, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Warning, device, message, args);
|
Log.LogMessage(LogEventLevel.Warning, device, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogError method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogError(this IKeyed device, Exception ex, string message, params object[] args)
|
public static void LogError(this IKeyed device, Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Error, ex, message, device, args);
|
Log.LogMessage(LogEventLevel.Error, ex, message, device, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogError method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogError(this IKeyed device, string message, params object[] args)
|
public static void LogError(this IKeyed device, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Error, device, message, args);
|
Log.LogMessage(LogEventLevel.Error, device, message, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogFatal method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogFatal(this IKeyed device, Exception ex, string message, params object[] args)
|
public static void LogFatal(this IKeyed device, Exception ex, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Fatal, ex, message, device, args);
|
Log.LogMessage(LogEventLevel.Fatal, ex, message, device, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LogFatal method
|
|
||||||
/// </summary>
|
|
||||||
public static void LogFatal(this IKeyed device, string message, params object[] args)
|
public static void LogFatal(this IKeyed device, string message, params object[] args)
|
||||||
{
|
{
|
||||||
Log.LogMessage(LogEventLevel.Fatal, device, message, args);
|
Log.LogMessage(LogEventLevel.Fatal, device, message, args);
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ using Newtonsoft.Json;
|
|||||||
|
|
||||||
namespace PepperDash.Core.Logging
|
namespace PepperDash.Core.Logging
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a DebugContextCollection
|
/// Class to persist current Debug settings across program restarts
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class DebugContextCollection
|
public class DebugContextCollection
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -39,9 +39,6 @@ namespace PepperDash.Core.Logging
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="contextKey"></param>
|
/// <param name="contextKey"></param>
|
||||||
/// <param name="level"></param>
|
/// <param name="level"></param>
|
||||||
/// <summary>
|
|
||||||
/// SetLevel method
|
|
||||||
/// </summary>
|
|
||||||
public void SetLevel(string contextKey, int level)
|
public void SetLevel(string contextKey, int level)
|
||||||
{
|
{
|
||||||
if (level < 0 || level > 2)
|
if (level < 0 || level > 2)
|
||||||
@@ -54,9 +51,6 @@ namespace PepperDash.Core.Logging
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="contextKey"></param>
|
/// <param name="contextKey"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// GetOrCreateItem method
|
|
||||||
/// </summary>
|
|
||||||
public DebugContextItem GetOrCreateItem(string contextKey)
|
public DebugContextItem GetOrCreateItem(string contextKey)
|
||||||
{
|
{
|
||||||
if (!_items.ContainsKey(contextKey))
|
if (!_items.ContainsKey(contextKey))
|
||||||
@@ -71,9 +65,6 @@ namespace PepperDash.Core.Logging
|
|||||||
/// <param name="deviceKey"></param>
|
/// <param name="deviceKey"></param>
|
||||||
/// <param name="settings"></param>
|
/// <param name="settings"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// SetDebugSettingsForKey method
|
|
||||||
/// </summary>
|
|
||||||
public void SetDebugSettingsForKey(string deviceKey, object settings)
|
public void SetDebugSettingsForKey(string deviceKey, object settings)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -98,9 +89,6 @@ namespace PepperDash.Core.Logging
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="deviceKey"></param>
|
/// <param name="deviceKey"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// GetDebugSettingsForKey method
|
|
||||||
/// </summary>
|
|
||||||
public object GetDebugSettingsForKey(string deviceKey)
|
public object GetDebugSettingsForKey(string deviceKey)
|
||||||
{
|
{
|
||||||
return DeviceDebugSettings[deviceKey];
|
return DeviceDebugSettings[deviceKey];
|
||||||
|
|||||||
@@ -21,9 +21,6 @@ using Serilog.Formatting.Json;
|
|||||||
|
|
||||||
namespace PepperDash.Core
|
namespace PepperDash.Core
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a DebugWebsocketSink
|
|
||||||
/// </summary>
|
|
||||||
public class DebugWebsocketSink : ILogEventSink
|
public class DebugWebsocketSink : ILogEventSink
|
||||||
{
|
{
|
||||||
private HttpServer _httpsServer;
|
private HttpServer _httpsServer;
|
||||||
@@ -50,9 +47,6 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the IsRunning
|
|
||||||
/// </summary>
|
|
||||||
public bool IsRunning { get => _httpsServer?.IsListening ?? false; }
|
public bool IsRunning { get => _httpsServer?.IsListening ?? false; }
|
||||||
|
|
||||||
|
|
||||||
@@ -111,9 +105,6 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Emit method
|
|
||||||
/// </summary>
|
|
||||||
public void Emit(LogEvent logEvent)
|
public void Emit(LogEvent logEvent)
|
||||||
{
|
{
|
||||||
if (_httpsServer == null || !_httpsServer.IsListening) return;
|
if (_httpsServer == null || !_httpsServer.IsListening) return;
|
||||||
@@ -125,9 +116,6 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// StartServerAndSetPort method
|
|
||||||
/// </summary>
|
|
||||||
public void StartServerAndSetPort(int port)
|
public void StartServerAndSetPort(int port)
|
||||||
{
|
{
|
||||||
Debug.Console(0, "Starting Websocket Server on port: {0}", port);
|
Debug.Console(0, "Starting Websocket Server on port: {0}", port);
|
||||||
@@ -205,9 +193,6 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// StopServer method
|
|
||||||
/// </summary>
|
|
||||||
public void StopServer()
|
public void StopServer()
|
||||||
{
|
{
|
||||||
Debug.Console(0, "Stopping Websocket Server");
|
Debug.Console(0, "Stopping Websocket Server");
|
||||||
@@ -219,9 +204,6 @@ namespace PepperDash.Core
|
|||||||
|
|
||||||
public static class DebugWebsocketSinkExtensions
|
public static class DebugWebsocketSinkExtensions
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// DebugWebsocketSink method
|
|
||||||
/// </summary>
|
|
||||||
public static LoggerConfiguration DebugWebsocketSink(
|
public static LoggerConfiguration DebugWebsocketSink(
|
||||||
this LoggerSinkConfiguration loggerConfiguration,
|
this LoggerSinkConfiguration loggerConfiguration,
|
||||||
ITextFormatter formatProvider = null)
|
ITextFormatter formatProvider = null)
|
||||||
@@ -230,9 +212,6 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Represents a DebugClient
|
|
||||||
/// </summary>
|
|
||||||
public class DebugClient : WebSocketBehavior
|
public class DebugClient : WebSocketBehavior
|
||||||
{
|
{
|
||||||
private DateTime _connectionTime;
|
private DateTime _connectionTime;
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
namespace PepperDash.Core.PasswordManagement
|
namespace PepperDash.Core.PasswordManagement
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a PasswordClient
|
/// A class to allow user interaction with the PasswordManager
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class PasswordClient
|
public class PasswordClient
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -59,9 +59,6 @@ namespace PepperDash.Core.PasswordManagement
|
|||||||
/// Retrieve password by index
|
/// Retrieve password by index
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <summary>
|
|
||||||
/// GetPasswordByIndex method
|
|
||||||
/// </summary>
|
|
||||||
public void GetPasswordByIndex(ushort key)
|
public void GetPasswordByIndex(ushort key)
|
||||||
{
|
{
|
||||||
OnUshrtChange((ushort)PasswordManager.Passwords.Count, 0, PasswordManagementConstants.PasswordManagerCountChange);
|
OnUshrtChange((ushort)PasswordManager.Passwords.Count, 0, PasswordManagementConstants.PasswordManagerCountChange);
|
||||||
@@ -84,9 +81,6 @@ namespace PepperDash.Core.PasswordManagement
|
|||||||
/// Password validation method
|
/// Password validation method
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="password"></param>
|
/// <param name="password"></param>
|
||||||
/// <summary>
|
|
||||||
/// ValidatePassword method
|
|
||||||
/// </summary>
|
|
||||||
public void ValidatePassword(string password)
|
public void ValidatePassword(string password)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(password))
|
if (string.IsNullOrEmpty(password))
|
||||||
@@ -105,9 +99,6 @@ namespace PepperDash.Core.PasswordManagement
|
|||||||
/// password against the selected password when the length of the 2 are equal
|
/// password against the selected password when the length of the 2 are equal
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="data"></param>
|
/// <param name="data"></param>
|
||||||
/// <summary>
|
|
||||||
/// BuildPassword method
|
|
||||||
/// </summary>
|
|
||||||
public void BuildPassword(string data)
|
public void BuildPassword(string data)
|
||||||
{
|
{
|
||||||
PasswordToValidate = String.Concat(PasswordToValidate, data);
|
PasswordToValidate = String.Concat(PasswordToValidate, data);
|
||||||
@@ -117,9 +108,9 @@ namespace PepperDash.Core.PasswordManagement
|
|||||||
ValidatePassword(PasswordToValidate);
|
ValidatePassword(PasswordToValidate);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// ClearPassword method
|
/// Clears the user entered password and resets the LEDs
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void ClearPassword()
|
public void ClearPassword()
|
||||||
{
|
{
|
||||||
PasswordToValidate = "";
|
PasswordToValidate = "";
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ using Crestron.SimplSharp;
|
|||||||
|
|
||||||
namespace PepperDash.Core.PasswordManagement
|
namespace PepperDash.Core.PasswordManagement
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a PasswordManager
|
/// Allows passwords to be stored and managed
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class PasswordManager
|
public class PasswordManager
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -71,9 +71,6 @@ namespace PepperDash.Core.PasswordManagement
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="key"></param>
|
/// <param name="key"></param>
|
||||||
/// <param name="password"></param>
|
/// <param name="password"></param>
|
||||||
/// <summary>
|
|
||||||
/// UpdatePassword method
|
|
||||||
/// </summary>
|
|
||||||
public void UpdatePassword(ushort key, string password)
|
public void UpdatePassword(ushort key, string password)
|
||||||
{
|
{
|
||||||
// validate the parameters
|
// validate the parameters
|
||||||
@@ -155,9 +152,6 @@ namespace PepperDash.Core.PasswordManagement
|
|||||||
/// Method to change the default timer value, (default 5000ms/5s)
|
/// Method to change the default timer value, (default 5000ms/5s)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="time"></param>
|
/// <param name="time"></param>
|
||||||
/// <summary>
|
|
||||||
/// PasswordTimerMs method
|
|
||||||
/// </summary>
|
|
||||||
public void PasswordTimerMs(ushort time)
|
public void PasswordTimerMs(ushort time)
|
||||||
{
|
{
|
||||||
PasswordTimerElapsedMs = Convert.ToInt64(time);
|
PasswordTimerElapsedMs = Convert.ToInt64(time);
|
||||||
|
|||||||
@@ -68,9 +68,9 @@ namespace PepperDash.Core.SystemInfo
|
|||||||
public const ushort ProgramConfigChange = 305;
|
public const ushort ProgramConfigChange = 305;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a ProcessorChangeEventArgs
|
/// Processor Change Event Args Class
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ProcessorChangeEventArgs : EventArgs
|
public class ProcessorChangeEventArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -114,9 +114,9 @@ namespace PepperDash.Core.SystemInfo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a EthernetChangeEventArgs
|
/// Ethernet Change Event Args Class
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class EthernetChangeEventArgs : EventArgs
|
public class EthernetChangeEventArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -165,9 +165,9 @@ namespace PepperDash.Core.SystemInfo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a ControlSubnetChangeEventArgs
|
/// Control Subnet Chage Event Args Class
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ControlSubnetChangeEventArgs : EventArgs
|
public class ControlSubnetChangeEventArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -211,9 +211,9 @@ namespace PepperDash.Core.SystemInfo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a ProgramChangeEventArgs
|
/// Program Change Event Args Class
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ProgramChangeEventArgs : EventArgs
|
public class ProgramChangeEventArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -100,9 +100,9 @@ namespace PepperDash.Core.SystemInfo
|
|||||||
OnBoolChange(false, 0, SystemInfoConstants.BusyBoolChange);
|
OnBoolChange(false, 0, SystemInfoConstants.BusyBoolChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// GetEthernetInfo method
|
/// Gets the current ethernet info
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void GetEthernetInfo()
|
public void GetEthernetInfo()
|
||||||
{
|
{
|
||||||
OnBoolChange(true, 0, SystemInfoConstants.BusyBoolChange);
|
OnBoolChange(true, 0, SystemInfoConstants.BusyBoolChange);
|
||||||
@@ -161,9 +161,9 @@ namespace PepperDash.Core.SystemInfo
|
|||||||
OnBoolChange(false, 0, SystemInfoConstants.BusyBoolChange);
|
OnBoolChange(false, 0, SystemInfoConstants.BusyBoolChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// GetControlSubnetInfo method
|
/// Gets the current control subnet info
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void GetControlSubnetInfo()
|
public void GetControlSubnetInfo()
|
||||||
{
|
{
|
||||||
OnBoolChange(true, 0, SystemInfoConstants.BusyBoolChange);
|
OnBoolChange(true, 0, SystemInfoConstants.BusyBoolChange);
|
||||||
@@ -206,9 +206,6 @@ namespace PepperDash.Core.SystemInfo
|
|||||||
/// Gets the program info by index
|
/// Gets the program info by index
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="index"></param>
|
/// <param name="index"></param>
|
||||||
/// <summary>
|
|
||||||
/// GetProgramInfoByIndex method
|
|
||||||
/// </summary>
|
|
||||||
public void GetProgramInfoByIndex(ushort index)
|
public void GetProgramInfoByIndex(ushort index)
|
||||||
{
|
{
|
||||||
if (index < 1 || index > 10)
|
if (index < 1 || index > 10)
|
||||||
@@ -266,9 +263,9 @@ namespace PepperDash.Core.SystemInfo
|
|||||||
OnBoolChange(false, 0, SystemInfoConstants.BusyBoolChange);
|
OnBoolChange(false, 0, SystemInfoConstants.BusyBoolChange);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// RefreshProcessorUptime method
|
/// Gets the processor uptime and passes it to S+
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void RefreshProcessorUptime()
|
public void RefreshProcessorUptime()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -290,9 +287,6 @@ namespace PepperDash.Core.SystemInfo
|
|||||||
/// Gets the program uptime, by index, and passes it to S+
|
/// Gets the program uptime, by index, and passes it to S+
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="index"></param>
|
/// <param name="index"></param>
|
||||||
/// <summary>
|
|
||||||
/// RefreshProgramUptimeByIndex method
|
|
||||||
/// </summary>
|
|
||||||
public void RefreshProgramUptimeByIndex(int index)
|
public void RefreshProgramUptimeByIndex(int index)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -314,9 +308,6 @@ namespace PepperDash.Core.SystemInfo
|
|||||||
/// Sends command to console, passes response back using string change event
|
/// Sends command to console, passes response back using string change event
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="cmd"></param>
|
/// <param name="cmd"></param>
|
||||||
/// <summary>
|
|
||||||
/// SendConsoleCommand method
|
|
||||||
/// </summary>
|
|
||||||
public void SendConsoleCommand(string cmd)
|
public void SendConsoleCommand(string cmd)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(cmd))
|
if (string.IsNullOrEmpty(cmd))
|
||||||
|
|||||||
@@ -35,9 +35,6 @@ namespace PepperDash.Core
|
|||||||
return issuerCertificate;
|
return issuerCertificate;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// IssueCertificate method
|
|
||||||
/// </summary>
|
|
||||||
public X509Certificate2 IssueCertificate(string subjectName, X509Certificate2 issuerCertificate, string[] subjectAlternativeNames, KeyPurposeID[] usages)
|
public X509Certificate2 IssueCertificate(string subjectName, X509Certificate2 issuerCertificate, string[] subjectAlternativeNames, KeyPurposeID[] usages)
|
||||||
{
|
{
|
||||||
// It's self-signed, so these are the same.
|
// It's self-signed, so these are the same.
|
||||||
@@ -59,9 +56,6 @@ namespace PepperDash.Core
|
|||||||
return ConvertCertificate(certificate, subjectKeyPair, random);
|
return ConvertCertificate(certificate, subjectKeyPair, random);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// CreateCertificateAuthorityCertificate method
|
|
||||||
/// </summary>
|
|
||||||
public X509Certificate2 CreateCertificateAuthorityCertificate(string subjectName, string[] subjectAlternativeNames, KeyPurposeID[] usages)
|
public X509Certificate2 CreateCertificateAuthorityCertificate(string subjectName, string[] subjectAlternativeNames, KeyPurposeID[] usages)
|
||||||
{
|
{
|
||||||
// It's self-signed, so these are the same.
|
// It's self-signed, so these are the same.
|
||||||
@@ -84,9 +78,6 @@ namespace PepperDash.Core
|
|||||||
return ConvertCertificate(certificate, subjectKeyPair, random);
|
return ConvertCertificate(certificate, subjectKeyPair, random);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// CreateSelfSignedCertificate method
|
|
||||||
/// </summary>
|
|
||||||
public X509Certificate2 CreateSelfSignedCertificate(string subjectName, string[] subjectAlternativeNames, KeyPurposeID[] usages)
|
public X509Certificate2 CreateSelfSignedCertificate(string subjectName, string[] subjectAlternativeNames, KeyPurposeID[] usages)
|
||||||
{
|
{
|
||||||
// It's self-signed, so these are the same.
|
// It's self-signed, so these are the same.
|
||||||
@@ -314,9 +305,6 @@ namespace PepperDash.Core
|
|||||||
return convertedCertificate;
|
return convertedCertificate;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// WriteCertificate method
|
|
||||||
/// </summary>
|
|
||||||
public void WriteCertificate(X509Certificate2 certificate, string outputDirectory, string certName)
|
public void WriteCertificate(X509Certificate2 certificate, string outputDirectory, string certName)
|
||||||
{
|
{
|
||||||
// This password is the one attached to the PFX file. Use 'null' for no password.
|
// This password is the one attached to the PFX file. Use 'null' for no password.
|
||||||
@@ -344,9 +332,6 @@ namespace PepperDash.Core
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// <summary>
|
|
||||||
/// AddCertToStore method
|
|
||||||
/// </summary>
|
|
||||||
public bool AddCertToStore(X509Certificate2 cert, System.Security.Cryptography.X509Certificates.StoreName st, System.Security.Cryptography.X509Certificates.StoreLocation sl)
|
public bool AddCertToStore(X509Certificate2 cert, System.Security.Cryptography.X509Certificates.StoreName st, System.Security.Cryptography.X509Certificates.StoreLocation sl)
|
||||||
{
|
{
|
||||||
bool bRet = false;
|
bool bRet = false;
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
namespace PepperDash.Core.Web.RequestHandlers
|
namespace PepperDash.Core.Web.RequestHandlers
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a DefaultRequestHandler
|
/// Web API default request handler
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class DefaultRequestHandler : WebApiBaseRequestHandler
|
public class DefaultRequestHandler : WebApiBaseRequestHandler
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -142,9 +142,6 @@ namespace PepperDash.Core.Web.RequestHandlers
|
|||||||
/// Process request
|
/// Process request
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="context"></param>
|
/// <param name="context"></param>
|
||||||
/// <summary>
|
|
||||||
/// ProcessRequest method
|
|
||||||
/// </summary>
|
|
||||||
public void ProcessRequest(HttpCwsContext context)
|
public void ProcessRequest(HttpCwsContext context)
|
||||||
{
|
{
|
||||||
if (!_handlers.TryGetValue(context.Request.HttpMethod, out Func<HttpCwsContext, Task> handler))
|
if (!_handlers.TryGetValue(context.Request.HttpMethod, out Func<HttpCwsContext, Task> handler))
|
||||||
|
|||||||
@@ -144,9 +144,6 @@ namespace PepperDash.Core.Web.RequestHandlers
|
|||||||
/// Process request
|
/// Process request
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="context"></param>
|
/// <param name="context"></param>
|
||||||
/// <summary>
|
|
||||||
/// ProcessRequest method
|
|
||||||
/// </summary>
|
|
||||||
public void ProcessRequest(HttpCwsContext context)
|
public void ProcessRequest(HttpCwsContext context)
|
||||||
{
|
{
|
||||||
Action<HttpCwsContext> handler;
|
Action<HttpCwsContext> handler;
|
||||||
|
|||||||
@@ -25,24 +25,24 @@ namespace PepperDash.Core.Web
|
|||||||
private readonly CCriticalSection _serverLock = new CCriticalSection();
|
private readonly CCriticalSection _serverLock = new CCriticalSection();
|
||||||
private HttpCwsServer _server;
|
private HttpCwsServer _server;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Key
|
/// Web API server key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Key { get; private set; }
|
public string Key { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Name
|
/// Web API server name
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Name { get; private set; }
|
public string Name { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the BasePath
|
/// CWS base path, will default to "/api" if not set via initialize method
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string BasePath { get; private set; }
|
public string BasePath { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the IsRegistered
|
/// Indicates CWS is registered with base path
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsRegistered { get; private set; }
|
public bool IsRegistered { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -137,9 +137,9 @@ namespace PepperDash.Core.Web
|
|||||||
Start();
|
Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initialize method
|
/// Initializes CWS class
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Initialize(string key, string basePath)
|
public void Initialize(string key, string basePath)
|
||||||
{
|
{
|
||||||
Key = key;
|
Key = key;
|
||||||
@@ -165,9 +165,6 @@ namespace PepperDash.Core.Web
|
|||||||
/// Removes a route from CWS
|
/// Removes a route from CWS
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="route"></param>
|
/// <param name="route"></param>
|
||||||
/// <summary>
|
|
||||||
/// RemoveRoute method
|
|
||||||
/// </summary>
|
|
||||||
public void RemoveRoute(HttpCwsRoute route)
|
public void RemoveRoute(HttpCwsRoute route)
|
||||||
{
|
{
|
||||||
if (route == null)
|
if (route == null)
|
||||||
@@ -179,9 +176,9 @@ namespace PepperDash.Core.Web
|
|||||||
_server.Routes.Remove(route);
|
_server.Routes.Remove(route);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// GetRouteCollection method
|
/// Returns a list of the current routes
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public HttpCwsRouteCollection GetRouteCollection()
|
public HttpCwsRouteCollection GetRouteCollection()
|
||||||
{
|
{
|
||||||
return _server.Routes;
|
return _server.Routes;
|
||||||
@@ -225,9 +222,9 @@ namespace PepperDash.Core.Web
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Stop method
|
/// Stop CWS instance
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Stop()
|
public void Stop()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
namespace PepperDash.Core.WebApi.Presets
|
namespace PepperDash.Core.WebApi.Presets
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a Preset
|
/// Represents a preset
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class Preset
|
public class Preset
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -12,29 +12,29 @@ namespace PepperDash.Core.WebApi.Presets
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the UserId
|
/// User ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int UserId { get; set; }
|
public int UserId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the RoomTypeId
|
/// Room Type ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int RoomTypeId { get; set; }
|
public int RoomTypeId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the PresetName
|
/// Preset Name
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string PresetName { get; set; }
|
public string PresetName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the PresetNumber
|
/// Preset Number
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int PresetNumber { get; set; }
|
public int PresetNumber { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Data
|
/// Preset Data
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Data { get; set; }
|
public string Data { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -48,9 +48,9 @@ namespace PepperDash.Core.WebApi.Presets
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a PresetReceivedEventArgs
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class PresetReceivedEventArgs : EventArgs
|
public class PresetReceivedEventArgs : EventArgs
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -59,12 +59,12 @@ namespace PepperDash.Core.WebApi.Presets
|
|||||||
public bool LookupSuccess { get; private set; }
|
public bool LookupSuccess { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the ULookupSuccess
|
/// S+ helper
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort ULookupSuccess { get { return (ushort)(LookupSuccess ? 1 : 0); } }
|
public ushort ULookupSuccess { get { return (ushort)(LookupSuccess ? 1 : 0); } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Preset
|
/// The preset
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public Preset Preset { get; private set; }
|
public Preset Preset { get; private set; }
|
||||||
|
|
||||||
|
|||||||
@@ -16,19 +16,19 @@ namespace PepperDash.Core.WebApi.Presets
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the ExternalId
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string ExternalId { get; set; }
|
public string ExternalId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the FirstName
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string FirstName { get; set; }
|
public string FirstName { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the LastName
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string LastName { get; set; }
|
public string LastName { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,13 +44,13 @@ namespace PepperDash.Core.WebApi.Presets
|
|||||||
public bool LookupSuccess { get; private set; }
|
public bool LookupSuccess { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the ULookupSuccess
|
/// For stupid S+
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public ushort ULookupSuccess { get { return (ushort)(LookupSuccess ? 1 : 0); } }
|
public ushort ULookupSuccess { get { return (ushort)(LookupSuccess ? 1 : 0); } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the User
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public User User { get; private set; }
|
public User User { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -70,9 +70,9 @@ namespace PepperDash.Core.WebApi.Presets
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a UserAndRoomMessage
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class UserAndRoomMessage
|
public class UserAndRoomMessage
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -80,14 +80,14 @@ namespace PepperDash.Core.WebApi.Presets
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public int UserId { get; set; }
|
public int UserId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the RoomTypeId
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int RoomTypeId { get; set; }
|
public int RoomTypeId { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the PresetNumber
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int PresetNumber { get; set; }
|
public int PresetNumber { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -25,9 +25,9 @@ namespace PepperDash.Core.WebApi.Presets
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public event EventHandler<PresetReceivedEventArgs> PresetReceived;
|
public event EventHandler<PresetReceivedEventArgs> PresetReceived;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Key
|
/// Unique identifier for this instance
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Key { get; private set; }
|
public string Key { get; private set; }
|
||||||
|
|
||||||
//string JsonMasterKey;
|
//string JsonMasterKey;
|
||||||
@@ -77,9 +77,6 @@ namespace PepperDash.Core.WebApi.Presets
|
|||||||
/// Gets the user for a passcode
|
/// Gets the user for a passcode
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="passcode"></param>
|
/// <param name="passcode"></param>
|
||||||
/// <summary>
|
|
||||||
/// GetUserForPasscode method
|
|
||||||
/// </summary>
|
|
||||||
public void GetUserForPasscode(string passcode)
|
public void GetUserForPasscode(string passcode)
|
||||||
{
|
{
|
||||||
// Bullshit duplicate code here... These two cases should be the same
|
// Bullshit duplicate code here... These two cases should be the same
|
||||||
@@ -118,9 +115,6 @@ namespace PepperDash.Core.WebApi.Presets
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="roomTypeId"></param>
|
/// <param name="roomTypeId"></param>
|
||||||
/// <param name="presetNumber"></param>
|
/// <param name="presetNumber"></param>
|
||||||
/// <summary>
|
|
||||||
/// GetPresetForThisUser method
|
|
||||||
/// </summary>
|
|
||||||
public void GetPresetForThisUser(int roomTypeId, int presetNumber)
|
public void GetPresetForThisUser(int roomTypeId, int presetNumber)
|
||||||
{
|
{
|
||||||
if (CurrentUser == null)
|
if (CurrentUser == null)
|
||||||
@@ -218,9 +212,6 @@ namespace PepperDash.Core.WebApi.Presets
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="roomTypeId"></param>
|
/// <param name="roomTypeId"></param>
|
||||||
/// <param name="presetNumber"></param>
|
/// <param name="presetNumber"></param>
|
||||||
/// <summary>
|
|
||||||
/// SavePresetForThisUser method
|
|
||||||
/// </summary>
|
|
||||||
public void SavePresetForThisUser(int roomTypeId, int presetNumber)
|
public void SavePresetForThisUser(int roomTypeId, int presetNumber)
|
||||||
{
|
{
|
||||||
if (CurrentPreset == null)
|
if (CurrentPreset == null)
|
||||||
|
|||||||
@@ -59,9 +59,6 @@ namespace PepperDash.Core.Intersystem.Tokens
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="offset"></param>
|
/// <param name="offset"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// GetTokenWithOffset method
|
|
||||||
/// </summary>
|
|
||||||
public override XSigToken GetTokenWithOffset(int offset)
|
public override XSigToken GetTokenWithOffset(int offset)
|
||||||
{
|
{
|
||||||
if (offset == 0) return this;
|
if (offset == 0) return this;
|
||||||
@@ -72,10 +69,6 @@ namespace PepperDash.Core.Intersystem.Tokens
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// ToString method
|
|
||||||
/// </summary>
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
{
|
{
|
||||||
return Index + " = 0x" + Value.ToString("X4");
|
return Index + " = 0x" + Value.ToString("X4");
|
||||||
@@ -87,9 +80,6 @@ namespace PepperDash.Core.Intersystem.Tokens
|
|||||||
/// <param name="format"></param>
|
/// <param name="format"></param>
|
||||||
/// <param name="formatProvider"></param>
|
/// <param name="formatProvider"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// ToString method
|
|
||||||
/// </summary>
|
|
||||||
public string ToString(string format, IFormatProvider formatProvider)
|
public string ToString(string format, IFormatProvider formatProvider)
|
||||||
{
|
{
|
||||||
return Value.ToString(format, formatProvider);
|
return Value.ToString(format, formatProvider);
|
||||||
|
|||||||
@@ -57,9 +57,6 @@ namespace PepperDash.Core.Intersystem.Tokens
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="offset"></param>
|
/// <param name="offset"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// GetTokenWithOffset method
|
|
||||||
/// </summary>
|
|
||||||
public override XSigToken GetTokenWithOffset(int offset)
|
public override XSigToken GetTokenWithOffset(int offset)
|
||||||
{
|
{
|
||||||
if (offset == 0) return this;
|
if (offset == 0) return this;
|
||||||
@@ -70,10 +67,6 @@ namespace PepperDash.Core.Intersystem.Tokens
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// ToString method
|
|
||||||
/// </summary>
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
{
|
{
|
||||||
return Index + " = " + (Value ? "High" : "Low");
|
return Index + " = " + (Value ? "High" : "Low");
|
||||||
@@ -84,9 +77,6 @@ namespace PepperDash.Core.Intersystem.Tokens
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="formatProvider"></param>
|
/// <param name="formatProvider"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// ToString method
|
|
||||||
/// </summary>
|
|
||||||
public string ToString(IFormatProvider formatProvider)
|
public string ToString(IFormatProvider formatProvider)
|
||||||
{
|
{
|
||||||
return Value.ToString(formatProvider);
|
return Value.ToString(formatProvider);
|
||||||
|
|||||||
@@ -63,9 +63,6 @@ namespace PepperDash.Core.Intersystem.Tokens
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="offset"></param>
|
/// <param name="offset"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// GetTokenWithOffset method
|
|
||||||
/// </summary>
|
|
||||||
public override XSigToken GetTokenWithOffset(int offset)
|
public override XSigToken GetTokenWithOffset(int offset)
|
||||||
{
|
{
|
||||||
if (offset == 0) return this;
|
if (offset == 0) return this;
|
||||||
@@ -76,10 +73,6 @@ namespace PepperDash.Core.Intersystem.Tokens
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
/// <summary>
|
|
||||||
/// ToString method
|
|
||||||
/// </summary>
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
{
|
{
|
||||||
return Index + " = \"" + Value + "\"";
|
return Index + " = \"" + Value + "\"";
|
||||||
|
|||||||
@@ -52,9 +52,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="xSigSerialization">XSig state resolver.</param>
|
/// <param name="xSigSerialization">XSig state resolver.</param>
|
||||||
/// <returns>Bytes in XSig format for each token within the state representation.</returns>
|
/// <returns>Bytes in XSig format for each token within the state representation.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(IXSigSerialization xSigSerialization)
|
public static byte[] GetBytes(IXSigSerialization xSigSerialization)
|
||||||
{
|
{
|
||||||
return GetBytes(xSigSerialization, 0);
|
return GetBytes(xSigSerialization, 0);
|
||||||
@@ -66,9 +63,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="xSigSerialization">XSig state resolver.</param>
|
/// <param name="xSigSerialization">XSig state resolver.</param>
|
||||||
/// <param name="offset">Offset to which the data will be aligned.</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>
|
/// <returns>Bytes in XSig format for each token within the state representation.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(IXSigSerialization xSigSerialization, int offset)
|
public static byte[] GetBytes(IXSigSerialization xSigSerialization, int offset)
|
||||||
{
|
{
|
||||||
var tokens = xSigSerialization.Serialize();
|
var tokens = xSigSerialization.Serialize();
|
||||||
@@ -88,9 +82,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="index">1-based digital index</param>
|
/// <param name="index">1-based digital index</param>
|
||||||
/// <param name="value">Digital data to be encoded</param>
|
/// <param name="value">Digital data to be encoded</param>
|
||||||
/// <returns>Bytes in XSig format for digtial information.</returns>
|
/// <returns>Bytes in XSig format for digtial information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int index, bool value)
|
public static byte[] GetBytes(int index, bool value)
|
||||||
{
|
{
|
||||||
return GetBytes(index, 0, value);
|
return GetBytes(index, 0, value);
|
||||||
@@ -103,9 +94,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="offset">Index offset.</param>
|
/// <param name="offset">Index offset.</param>
|
||||||
/// <param name="value">Digital data to be encoded</param>
|
/// <param name="value">Digital data to be encoded</param>
|
||||||
/// <returns>Bytes in XSig format for digtial information.</returns>
|
/// <returns>Bytes in XSig format for digtial information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int index, int offset, bool value)
|
public static byte[] GetBytes(int index, int offset, bool value)
|
||||||
{
|
{
|
||||||
return new XSigDigitalToken(index + offset, value).GetBytes();
|
return new XSigDigitalToken(index + offset, value).GetBytes();
|
||||||
@@ -117,9 +105,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="startIndex">Starting index of the sequence.</param>
|
/// <param name="startIndex">Starting index of the sequence.</param>
|
||||||
/// <param name="values">Digital signal value array.</param>
|
/// <param name="values">Digital signal value array.</param>
|
||||||
/// <returns>Byte sequence in XSig format for digital signal information.</returns>
|
/// <returns>Byte sequence in XSig format for digital signal information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int startIndex, bool[] values)
|
public static byte[] GetBytes(int startIndex, bool[] values)
|
||||||
{
|
{
|
||||||
return GetBytes(startIndex, 0, values);
|
return GetBytes(startIndex, 0, values);
|
||||||
@@ -132,9 +117,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="offset">Index offset.</param>
|
/// <param name="offset">Index offset.</param>
|
||||||
/// <param name="values">Digital signal value array.</param>
|
/// <param name="values">Digital signal value array.</param>
|
||||||
/// <returns>Byte sequence in XSig format for digital signal information.</returns>
|
/// <returns>Byte sequence in XSig format for digital signal information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int startIndex, int offset, bool[] values)
|
public static byte[] GetBytes(int startIndex, int offset, bool[] values)
|
||||||
{
|
{
|
||||||
// Digital XSig data is 2 bytes per value
|
// Digital XSig data is 2 bytes per value
|
||||||
@@ -152,9 +134,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="index">1-based analog index</param>
|
/// <param name="index">1-based analog index</param>
|
||||||
/// <param name="value">Analog data to be encoded</param>
|
/// <param name="value">Analog data to be encoded</param>
|
||||||
/// <returns>Bytes in XSig format for analog signal information.</returns>
|
/// <returns>Bytes in XSig format for analog signal information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int index, ushort value)
|
public static byte[] GetBytes(int index, ushort value)
|
||||||
{
|
{
|
||||||
return GetBytes(index, 0, value);
|
return GetBytes(index, 0, value);
|
||||||
@@ -167,9 +146,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="offset">Index offset.</param>
|
/// <param name="offset">Index offset.</param>
|
||||||
/// <param name="value">Analog data to be encoded</param>
|
/// <param name="value">Analog data to be encoded</param>
|
||||||
/// <returns>Bytes in XSig format for analog signal information.</returns>
|
/// <returns>Bytes in XSig format for analog signal information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int index, int offset, ushort value)
|
public static byte[] GetBytes(int index, int offset, ushort value)
|
||||||
{
|
{
|
||||||
return new XSigAnalogToken(index + offset, value).GetBytes();
|
return new XSigAnalogToken(index + offset, value).GetBytes();
|
||||||
@@ -181,9 +157,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="startIndex">Starting index of the sequence.</param>
|
/// <param name="startIndex">Starting index of the sequence.</param>
|
||||||
/// <param name="values">Analog signal value array.</param>
|
/// <param name="values">Analog signal value array.</param>
|
||||||
/// <returns>Byte sequence in XSig format for analog signal information.</returns>
|
/// <returns>Byte sequence in XSig format for analog signal information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int startIndex, ushort[] values)
|
public static byte[] GetBytes(int startIndex, ushort[] values)
|
||||||
{
|
{
|
||||||
return GetBytes(startIndex, 0, values);
|
return GetBytes(startIndex, 0, values);
|
||||||
@@ -196,9 +169,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="offset">Index offset.</param>
|
/// <param name="offset">Index offset.</param>
|
||||||
/// <param name="values">Analog signal value array.</param>
|
/// <param name="values">Analog signal value array.</param>
|
||||||
/// <returns>Byte sequence in XSig format for analog signal information.</returns>
|
/// <returns>Byte sequence in XSig format for analog signal information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int startIndex, int offset, ushort[] values)
|
public static byte[] GetBytes(int startIndex, int offset, ushort[] values)
|
||||||
{
|
{
|
||||||
// Analog XSig data is 4 bytes per value
|
// Analog XSig data is 4 bytes per value
|
||||||
@@ -216,9 +186,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="index">1-based serial index</param>
|
/// <param name="index">1-based serial index</param>
|
||||||
/// <param name="value">Serial data to be encoded</param>
|
/// <param name="value">Serial data to be encoded</param>
|
||||||
/// <returns>Bytes in XSig format for serial signal information.</returns>
|
/// <returns>Bytes in XSig format for serial signal information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int index, string value)
|
public static byte[] GetBytes(int index, string value)
|
||||||
{
|
{
|
||||||
return GetBytes(index, 0, value);
|
return GetBytes(index, 0, value);
|
||||||
@@ -231,9 +198,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="offset">Index offset.</param>
|
/// <param name="offset">Index offset.</param>
|
||||||
/// <param name="value">Serial data to be encoded</param>
|
/// <param name="value">Serial data to be encoded</param>
|
||||||
/// <returns>Bytes in XSig format for serial signal information.</returns>
|
/// <returns>Bytes in XSig format for serial signal information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int index, int offset, string value)
|
public static byte[] GetBytes(int index, int offset, string value)
|
||||||
{
|
{
|
||||||
return new XSigSerialToken(index + offset, value).GetBytes();
|
return new XSigSerialToken(index + offset, value).GetBytes();
|
||||||
@@ -245,9 +209,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="startIndex">Starting index of the sequence.</param>
|
/// <param name="startIndex">Starting index of the sequence.</param>
|
||||||
/// <param name="values">Serial signal value array.</param>
|
/// <param name="values">Serial signal value array.</param>
|
||||||
/// <returns>Byte sequence in XSig format for serial signal information.</returns>
|
/// <returns>Byte sequence in XSig format for serial signal information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int startIndex, string[] values)
|
public static byte[] GetBytes(int startIndex, string[] values)
|
||||||
{
|
{
|
||||||
return GetBytes(startIndex, 0, values);
|
return GetBytes(startIndex, 0, values);
|
||||||
@@ -260,9 +221,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="offset">Index offset.</param>
|
/// <param name="offset">Index offset.</param>
|
||||||
/// <param name="values">Serial signal value array.</param>
|
/// <param name="values">Serial signal value array.</param>
|
||||||
/// <returns>Byte sequence in XSig format for serial signal information.</returns>
|
/// <returns>Byte sequence in XSig format for serial signal information.</returns>
|
||||||
/// <summary>
|
|
||||||
/// GetBytes method
|
|
||||||
/// </summary>
|
|
||||||
public static byte[] GetBytes(int startIndex, int offset, string[] values)
|
public static byte[] GetBytes(int startIndex, int offset, string[] values)
|
||||||
{
|
{
|
||||||
// Serial XSig data is not fixed-length like the other formats
|
// Serial XSig data is not fixed-length like the other formats
|
||||||
|
|||||||
@@ -48,9 +48,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// <param name="stream">Input stream</param>
|
/// <param name="stream">Input stream</param>
|
||||||
/// <param name="value">Result</param>
|
/// <param name="value">Result</param>
|
||||||
/// <returns>True if successful, otherwise false.</returns>
|
/// <returns>True if successful, otherwise false.</returns>
|
||||||
/// <summary>
|
|
||||||
/// TryReadUInt16BE method
|
|
||||||
/// </summary>
|
|
||||||
public static bool TryReadUInt16BE(Stream stream, out ushort value)
|
public static bool TryReadUInt16BE(Stream stream, out ushort value)
|
||||||
{
|
{
|
||||||
value = 0;
|
value = 0;
|
||||||
@@ -68,9 +65,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>XSigToken</returns>
|
/// <returns>XSigToken</returns>
|
||||||
/// <exception cref="ArgumentOutOfRangeException">Offset is less than 0.</exception>
|
/// <exception cref="ArgumentOutOfRangeException">Offset is less than 0.</exception>
|
||||||
/// <summary>
|
|
||||||
/// ReadXSigToken method
|
|
||||||
/// </summary>
|
|
||||||
public XSigToken ReadXSigToken()
|
public XSigToken ReadXSigToken()
|
||||||
{
|
{
|
||||||
ushort prefix;
|
ushort prefix;
|
||||||
@@ -120,9 +114,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// Reads all available XSig tokens from the stream.
|
/// Reads all available XSig tokens from the stream.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>XSigToken collection.</returns>
|
/// <returns>XSigToken collection.</returns>
|
||||||
/// <summary>
|
|
||||||
/// ReadAllXSigTokens method
|
|
||||||
/// </summary>
|
|
||||||
public IEnumerable<XSigToken> ReadAllXSigTokens()
|
public IEnumerable<XSigToken> ReadAllXSigTokens()
|
||||||
{
|
{
|
||||||
var tokens = new List<XSigToken>();
|
var tokens = new List<XSigToken>();
|
||||||
|
|||||||
@@ -47,9 +47,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// Write XSig data gathered from an IXSigStateResolver to the stream.
|
/// Write XSig data gathered from an IXSigStateResolver to the stream.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="xSigSerialization">IXSigStateResolver object.</param>
|
/// <param name="xSigSerialization">IXSigStateResolver object.</param>
|
||||||
/// <summary>
|
|
||||||
/// WriteXSigData method
|
|
||||||
/// </summary>
|
|
||||||
public void WriteXSigData(IXSigSerialization xSigSerialization)
|
public void WriteXSigData(IXSigSerialization xSigSerialization)
|
||||||
{
|
{
|
||||||
WriteXSigData(xSigSerialization, 0);
|
WriteXSigData(xSigSerialization, 0);
|
||||||
@@ -60,9 +57,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="xSigSerialization">IXSigStateResolver object.</param>
|
/// <param name="xSigSerialization">IXSigStateResolver object.</param>
|
||||||
/// <param name="offset">Index offset for each XSigToken.</param>
|
/// <param name="offset">Index offset for each XSigToken.</param>
|
||||||
/// <summary>
|
|
||||||
/// WriteXSigData method
|
|
||||||
/// </summary>
|
|
||||||
public void WriteXSigData(IXSigSerialization xSigSerialization, int offset)
|
public void WriteXSigData(IXSigSerialization xSigSerialization, int offset)
|
||||||
{
|
{
|
||||||
if (xSigSerialization == null)
|
if (xSigSerialization == null)
|
||||||
@@ -76,9 +70,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// Write XSigToken to the stream.
|
/// Write XSigToken to the stream.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="token">XSigToken object.</param>
|
/// <param name="token">XSigToken object.</param>
|
||||||
/// <summary>
|
|
||||||
/// WriteXSigData method
|
|
||||||
/// </summary>
|
|
||||||
public void WriteXSigData(XSigToken token)
|
public void WriteXSigData(XSigToken token)
|
||||||
{
|
{
|
||||||
WriteXSigData(token, 0);
|
WriteXSigData(token, 0);
|
||||||
@@ -89,9 +80,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="token">XSigToken object.</param>
|
/// <param name="token">XSigToken object.</param>
|
||||||
/// <param name="offset">Index offset for each XSigToken.</param>
|
/// <param name="offset">Index offset for each XSigToken.</param>
|
||||||
/// <summary>
|
|
||||||
/// WriteXSigData method
|
|
||||||
/// </summary>
|
|
||||||
public void WriteXSigData(XSigToken token, int offset)
|
public void WriteXSigData(XSigToken token, int offset)
|
||||||
{
|
{
|
||||||
WriteXSigData(new[] { token }, offset);
|
WriteXSigData(new[] { token }, offset);
|
||||||
@@ -120,9 +108,6 @@ namespace PepperDash.Core.Intersystem
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="tokens">XSigToken objects.</param>
|
/// <param name="tokens">XSigToken objects.</param>
|
||||||
/// <param name="offset">Index offset for each XSigToken.</param>
|
/// <param name="offset">Index offset for each XSigToken.</param>
|
||||||
/// <summary>
|
|
||||||
/// WriteXSigData method
|
|
||||||
/// </summary>
|
|
||||||
public void WriteXSigData(IEnumerable<XSigToken> tokens, int offset)
|
public void WriteXSigData(IEnumerable<XSigToken> tokens, int offset)
|
||||||
{
|
{
|
||||||
if (offset < 0)
|
if (offset < 0)
|
||||||
@@ -140,7 +125,7 @@ namespace PepperDash.Core.Intersystem
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Dispose method
|
/// Disposes of the internal stream if specified to not leave open.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a EiscApiAdvanced
|
/// Bridge API using EISC
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
|
public class EiscApiAdvanced : BridgeApi, ICommunicationMonitor
|
||||||
{
|
{
|
||||||
@@ -60,19 +60,12 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
AddPostActivationAction(RegisterEisc);
|
AddPostActivationAction(RegisterEisc);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// CustomActivate method
|
|
||||||
/// </summary>
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override bool CustomActivate()
|
public override bool CustomActivate()
|
||||||
{
|
{
|
||||||
CommunicationMonitor.Start();
|
CommunicationMonitor.Start();
|
||||||
return base.CustomActivate();
|
return base.CustomActivate();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Deactivate method
|
|
||||||
/// </summary>
|
|
||||||
public override bool Deactivate()
|
public override bool Deactivate()
|
||||||
{
|
{
|
||||||
CommunicationMonitor.Stop();
|
CommunicationMonitor.Stop();
|
||||||
@@ -130,9 +123,6 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
Debug.LogMessage(LogEventLevel.Debug, this, "EISC registration successful");
|
Debug.LogMessage(LogEventLevel.Debug, this, "EISC registration successful");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// LinkRooms method
|
|
||||||
/// </summary>
|
|
||||||
public void LinkRooms()
|
public void LinkRooms()
|
||||||
{
|
{
|
||||||
Debug.LogMessage(LogEventLevel.Debug, this, "Linking Rooms...");
|
Debug.LogMessage(LogEventLevel.Debug, this, "Linking Rooms...");
|
||||||
@@ -163,9 +153,6 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="deviceKey"></param>
|
/// <param name="deviceKey"></param>
|
||||||
/// <param name="joinMap"></param>
|
/// <param name="joinMap"></param>
|
||||||
/// <summary>
|
|
||||||
/// AddJoinMap method
|
|
||||||
/// </summary>
|
|
||||||
public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
|
public void AddJoinMap(string deviceKey, JoinMapBaseAdvanced joinMap)
|
||||||
{
|
{
|
||||||
if (!JoinMaps.ContainsKey(deviceKey))
|
if (!JoinMaps.ContainsKey(deviceKey))
|
||||||
@@ -179,9 +166,8 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// PrintJoinMaps method
|
/// Prints all the join maps on this bridge
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <inheritdoc />
|
|
||||||
public virtual void PrintJoinMaps()
|
public virtual void PrintJoinMaps()
|
||||||
{
|
{
|
||||||
CrestronConsole.ConsoleCommandResponse("Join Maps for EISC IPID: {0}\r\n", Eisc.ID.ToString("X"));
|
CrestronConsole.ConsoleCommandResponse("Join Maps for EISC IPID: {0}\r\n", Eisc.ID.ToString("X"));
|
||||||
@@ -193,9 +179,8 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// MarkdownForBridge method
|
/// Generates markdown for all join maps on this bridge
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <inheritdoc />
|
|
||||||
public virtual void MarkdownForBridge(string bridgeKey)
|
public virtual void MarkdownForBridge(string bridgeKey)
|
||||||
{
|
{
|
||||||
Debug.LogMessage(LogEventLevel.Information, this, "Writing Joinmaps to files for EISC IPID: {0}", Eisc.ID.ToString("X"));
|
Debug.LogMessage(LogEventLevel.Information, this, "Writing Joinmaps to files for EISC IPID: {0}", Eisc.ID.ToString("X"));
|
||||||
@@ -211,9 +196,6 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
/// Prints the join map for a device by key
|
/// Prints the join map for a device by key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="deviceKey"></param>
|
/// <param name="deviceKey"></param>
|
||||||
/// <summary>
|
|
||||||
/// PrintJoinMapForDevice method
|
|
||||||
/// </summary>
|
|
||||||
public void PrintJoinMapForDevice(string deviceKey)
|
public void PrintJoinMapForDevice(string deviceKey)
|
||||||
{
|
{
|
||||||
var joinMap = JoinMaps[deviceKey];
|
var joinMap = JoinMaps[deviceKey];
|
||||||
@@ -231,9 +213,6 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
/// Prints the join map for a device by key
|
/// Prints the join map for a device by key
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="deviceKey"></param>
|
/// <param name="deviceKey"></param>
|
||||||
/// <summary>
|
|
||||||
/// MarkdownJoinMapForDevice method
|
|
||||||
/// </summary>
|
|
||||||
public void MarkdownJoinMapForDevice(string deviceKey, string bridgeKey)
|
public void MarkdownJoinMapForDevice(string deviceKey, string bridgeKey)
|
||||||
{
|
{
|
||||||
var joinMap = JoinMaps[deviceKey];
|
var joinMap = JoinMaps[deviceKey];
|
||||||
@@ -254,9 +233,6 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
/// <param name="join"></param>
|
/// <param name="join"></param>
|
||||||
/// <param name="type"></param>
|
/// <param name="type"></param>
|
||||||
/// <param name="state"></param>
|
/// <param name="state"></param>
|
||||||
/// <summary>
|
|
||||||
/// ExecuteJoinAction method
|
|
||||||
/// </summary>
|
|
||||||
public void ExecuteJoinAction(uint join, string type, object state)
|
public void ExecuteJoinAction(uint join, string type, object state)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -342,91 +318,49 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
|
|
||||||
#region Implementation of ICommunicationMonitor
|
#region Implementation of ICommunicationMonitor
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the CommunicationMonitor
|
|
||||||
/// </summary>
|
|
||||||
public StatusMonitorBase CommunicationMonitor { get; private set; }
|
public StatusMonitorBase CommunicationMonitor { get; private set; }
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Represents a EiscApiPropertiesConfig
|
|
||||||
/// </summary>
|
|
||||||
public class EiscApiPropertiesConfig
|
public class EiscApiPropertiesConfig
|
||||||
{
|
{
|
||||||
[JsonProperty("control")]
|
[JsonProperty("control")]
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the Control
|
|
||||||
/// </summary>
|
|
||||||
public EssentialsControlPropertiesConfig Control { get; set; }
|
public EssentialsControlPropertiesConfig Control { get; set; }
|
||||||
|
|
||||||
[JsonProperty("devices")]
|
[JsonProperty("devices")]
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the Devices
|
|
||||||
/// </summary>
|
|
||||||
public List<ApiDevicePropertiesConfig> Devices { get; set; }
|
public List<ApiDevicePropertiesConfig> Devices { get; set; }
|
||||||
|
|
||||||
[JsonProperty("rooms")]
|
[JsonProperty("rooms")]
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the Rooms
|
|
||||||
/// </summary>
|
|
||||||
public List<ApiRoomPropertiesConfig> Rooms { get; set; }
|
public List<ApiRoomPropertiesConfig> Rooms { get; set; }
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Represents a ApiDevicePropertiesConfig
|
|
||||||
/// </summary>
|
|
||||||
public class ApiDevicePropertiesConfig
|
public class ApiDevicePropertiesConfig
|
||||||
{
|
{
|
||||||
[JsonProperty("deviceKey")]
|
[JsonProperty("deviceKey")]
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the DeviceKey
|
|
||||||
/// </summary>
|
|
||||||
public string DeviceKey { get; set; }
|
public string DeviceKey { get; set; }
|
||||||
|
|
||||||
[JsonProperty("joinStart")]
|
[JsonProperty("joinStart")]
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the JoinStart
|
|
||||||
/// </summary>
|
|
||||||
public uint JoinStart { get; set; }
|
public uint JoinStart { get; set; }
|
||||||
|
|
||||||
[JsonProperty("joinMapKey")]
|
[JsonProperty("joinMapKey")]
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the JoinMapKey
|
|
||||||
/// </summary>
|
|
||||||
public string JoinMapKey { get; set; }
|
public string JoinMapKey { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Represents a ApiRoomPropertiesConfig
|
|
||||||
/// </summary>
|
|
||||||
public class ApiRoomPropertiesConfig
|
public class ApiRoomPropertiesConfig
|
||||||
{
|
{
|
||||||
[JsonProperty("roomKey")]
|
[JsonProperty("roomKey")]
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the RoomKey
|
|
||||||
/// </summary>
|
|
||||||
public string RoomKey { get; set; }
|
public string RoomKey { get; set; }
|
||||||
|
|
||||||
[JsonProperty("joinStart")]
|
[JsonProperty("joinStart")]
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the JoinStart
|
|
||||||
/// </summary>
|
|
||||||
public uint JoinStart { get; set; }
|
public uint JoinStart { get; set; }
|
||||||
|
|
||||||
[JsonProperty("joinMapKey")]
|
[JsonProperty("joinMapKey")]
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the JoinMapKey
|
|
||||||
/// </summary>
|
|
||||||
public string JoinMapKey { get; set; }
|
public string JoinMapKey { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Represents a EiscApiAdvancedFactory
|
|
||||||
/// </summary>
|
|
||||||
public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
|
public class EiscApiAdvancedFactory : EssentialsDeviceFactory<EiscApiAdvanced>
|
||||||
{
|
{
|
||||||
public EiscApiAdvancedFactory()
|
public EiscApiAdvancedFactory()
|
||||||
@@ -434,10 +368,6 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
|
TypeNames = new List<string> { "eiscapiadv", "eiscapiadvanced", "eiscapiadvancedserver", "eiscapiadvancedclient", "vceiscapiadv", "vceiscapiadvanced" };
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// BuildDevice method
|
|
||||||
/// </summary>
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override EssentialsDevice BuildDevice(DeviceConfig dc)
|
public override EssentialsDevice BuildDevice(DeviceConfig dc)
|
||||||
{
|
{
|
||||||
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new EiscApiAdvanced Device");
|
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new EiscApiAdvanced Device");
|
||||||
|
|||||||
@@ -34,9 +34,6 @@ namespace PepperDash.Essentials.Core.Bridges
|
|||||||
bridge.PrintJoinMaps();
|
bridge.PrintJoinMaps();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// <summary>
|
|
||||||
/// JoinmapMarkdown method
|
|
||||||
/// </summary>
|
|
||||||
public static void JoinmapMarkdown(string command)
|
public static void JoinmapMarkdown(string command)
|
||||||
{
|
{
|
||||||
var targets = command.Split(' ');
|
var targets = command.Split(' ');
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Defines the contract for IBridgeAdvanced
|
/// Defines a device that uses JoinMapBaseAdvanced for its join map
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public interface IBridgeAdvanced
|
public interface IBridgeAdvanced
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,9 +2,6 @@ using System;
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a AirMediaControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class AirMediaControllerJoinMap : JoinMapBaseAdvanced
|
public class AirMediaControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("IsOnline")]
|
[JoinName("IsOnline")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a AppleTvJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class AppleTvJoinMap : JoinMapBaseAdvanced
|
public class AppleTvJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("UpArrow")]
|
[JoinName("UpArrow")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a C2nRthsControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class C2nRthsControllerJoinMap : JoinMapBaseAdvanced
|
public class C2nRthsControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("IsOnline")]
|
[JoinName("IsOnline")]
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a CameraControllerJoinMap
|
/// Join map for CameraBase devices
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class CameraControllerJoinMap : JoinMapBaseAdvanced
|
public class CameraControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a CenOdtOccupancySensorBaseJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class CenOdtOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
|
public class CenOdtOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
#region Digitals
|
#region Digitals
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a DisplayControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class DisplayControllerJoinMap : JoinMapBaseAdvanced
|
public class DisplayControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("Name")]
|
[JoinName("Name")]
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges {
|
namespace PepperDash.Essentials.Core.Bridges {
|
||||||
/// <summary>
|
|
||||||
/// Represents a DmBladeChassisControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class DmBladeChassisControllerJoinMap : JoinMapBaseAdvanced {
|
public class DmBladeChassisControllerJoinMap : JoinMapBaseAdvanced {
|
||||||
|
|
||||||
[JoinName("IsOnline")]
|
[JoinName("IsOnline")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@ using System;
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a DmChassisControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class DmChassisControllerJoinMap : JoinMapBaseAdvanced
|
public class DmChassisControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("EnableAudioBreakaway")]
|
[JoinName("EnableAudioBreakaway")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@ using System;
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a DmRmcControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class DmRmcControllerJoinMap : JoinMapBaseAdvanced
|
public class DmRmcControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("IsOnline")]
|
[JoinName("IsOnline")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a DmTxControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class DmTxControllerJoinMap : JoinMapBaseAdvanced
|
public class DmTxControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("IsOnline")]
|
[JoinName("IsOnline")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a DmpsAudioOutputControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class DmpsAudioOutputControllerJoinMap : JoinMapBaseAdvanced
|
public class DmpsAudioOutputControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a DmpsMicrophoneControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced
|
public class DmpsMicrophoneControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("MicGain")]
|
[JoinName("MicGain")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a DmpsRoutingControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
|
public class DmpsRoutingControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("EnableRouting")]
|
[JoinName("EnableRouting")]
|
||||||
|
|||||||
@@ -3,9 +3,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a GenericLightingJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class GenericLightingJoinMap : JoinMapBaseAdvanced
|
public class GenericLightingJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a GenericRelayControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class GenericRelayControllerJoinMap : JoinMapBaseAdvanced
|
public class GenericRelayControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a GlsOccupancySensorBaseJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class GlsOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
|
public class GlsOccupancySensorBaseJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("IsOnline")]
|
[JoinName("IsOnline")]
|
||||||
|
|||||||
@@ -3,9 +3,6 @@ using PepperDash.Essentials.Core;
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges.JoinMaps
|
namespace PepperDash.Essentials.Core.Bridges.JoinMaps
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a GlsPartitionSensorJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
|
public class GlsPartitionSensorJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a HdMdNxM4kEControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class HdMdNxM4kEControllerJoinMap : JoinMapBaseAdvanced
|
public class HdMdNxM4kEControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("Name")]
|
[JoinName("Name")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a HdMdxxxCEControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class HdMdxxxCEControllerJoinMap : JoinMapBaseAdvanced
|
public class HdMdxxxCEControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,6 @@ using PepperDash.Essentials.Core;
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a HdPsXxxControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class HdPsXxxControllerJoinMap : JoinMapBaseAdvanced
|
public class HdPsXxxControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a Hrxxx0WirelessRemoteControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class Hrxxx0WirelessRemoteControllerJoinMap : JoinMapBaseAdvanced
|
public class Hrxxx0WirelessRemoteControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("Power")]
|
[JoinName("Power")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a IAnalogInputJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class IAnalogInputJoinMap : JoinMapBaseAdvanced
|
public class IAnalogInputJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a IBasicCommunicationJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class IBasicCommunicationJoinMap : JoinMapBaseAdvanced
|
public class IBasicCommunicationJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("TextReceived")]
|
[JoinName("TextReceived")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a IDigitalInputJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class IDigitalInputJoinMap : JoinMapBaseAdvanced
|
public class IDigitalInputJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a IDigitalOutputJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class IDigitalOutputJoinMap : JoinMapBaseAdvanced
|
public class IDigitalOutputJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a PduJoinMapBase
|
|
||||||
/// </summary>
|
|
||||||
public class PduJoinMapBase : JoinMapBaseAdvanced
|
public class PduJoinMapBase : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("Name")]
|
[JoinName("Name")]
|
||||||
|
|||||||
@@ -3,9 +3,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a SetTopBoxControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class SetTopBoxControllerJoinMap : JoinMapBaseAdvanced
|
public class SetTopBoxControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("PowerOn")]
|
[JoinName("PowerOn")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a StatusSignControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class StatusSignControllerJoinMap : JoinMapBaseAdvanced
|
public class StatusSignControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("IsOnline")]
|
[JoinName("IsOnline")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core.Bridges
|
namespace PepperDash.Essentials.Core.Bridges
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a SystemMonitorJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class SystemMonitorJoinMap : JoinMapBaseAdvanced
|
public class SystemMonitorJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
[JoinName("TimeZone")]
|
[JoinName("TimeZone")]
|
||||||
|
|||||||
@@ -2,9 +2,6 @@ using System;
|
|||||||
using PepperDash.Essentials.Core;
|
using PepperDash.Essentials.Core;
|
||||||
namespace PepperDash.Essentials.Core.Bridges.JoinMaps
|
namespace PepperDash.Essentials.Core.Bridges.JoinMaps
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a VideoCodecControllerJoinMap
|
|
||||||
/// </summary>
|
|
||||||
public class VideoCodecControllerJoinMap : JoinMapBaseAdvanced
|
public class VideoCodecControllerJoinMap : JoinMapBaseAdvanced
|
||||||
{
|
{
|
||||||
#region Digital
|
#region Digital
|
||||||
|
|||||||
@@ -12,22 +12,13 @@ using Serilog.Events;
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core
|
namespace PepperDash.Essentials.Core
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a CecPortController
|
|
||||||
/// </summary>
|
|
||||||
public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
|
public class CecPortController : Device, IBasicCommunicationWithStreamDebugging
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the StreamDebugging
|
|
||||||
/// </summary>
|
|
||||||
public CommunicationStreamDebugging StreamDebugging { get; private set; }
|
public CommunicationStreamDebugging StreamDebugging { get; private set; }
|
||||||
|
|
||||||
public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
|
public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
|
||||||
public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
|
public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the IsConnected
|
|
||||||
/// </summary>
|
|
||||||
public bool IsConnected { get { return true; } }
|
public bool IsConnected { get { return true; } }
|
||||||
|
|
||||||
ICec Port;
|
ICec Port;
|
||||||
@@ -83,9 +74,6 @@ namespace PepperDash.Essentials.Core
|
|||||||
|
|
||||||
#region IBasicCommunication Members
|
#region IBasicCommunication Members
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// SendText method
|
|
||||||
/// </summary>
|
|
||||||
public void SendText(string text)
|
public void SendText(string text)
|
||||||
{
|
{
|
||||||
if (Port == null)
|
if (Port == null)
|
||||||
@@ -95,9 +83,6 @@ namespace PepperDash.Essentials.Core
|
|||||||
Port.StreamCec.Send.StringValue = text;
|
Port.StreamCec.Send.StringValue = text;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// SendBytes method
|
|
||||||
/// </summary>
|
|
||||||
public void SendBytes(byte[] bytes)
|
public void SendBytes(byte[] bytes)
|
||||||
{
|
{
|
||||||
if (Port == null)
|
if (Port == null)
|
||||||
@@ -108,16 +93,10 @@ namespace PepperDash.Essentials.Core
|
|||||||
Port.StreamCec.Send.StringValue = text;
|
Port.StreamCec.Send.StringValue = text;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Connect method
|
|
||||||
/// </summary>
|
|
||||||
public void Connect()
|
public void Connect()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Disconnect method
|
|
||||||
/// </summary>
|
|
||||||
public void Disconnect()
|
public void Disconnect()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -128,9 +107,6 @@ namespace PepperDash.Essentials.Core
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="s"></param>
|
/// <param name="s"></param>
|
||||||
/// <summary>
|
|
||||||
/// SimulateReceive method
|
|
||||||
/// </summary>
|
|
||||||
public void SimulateReceive(string s)
|
public void SimulateReceive(string s)
|
||||||
{
|
{
|
||||||
// split out hex chars and build string
|
// split out hex chars and build string
|
||||||
|
|||||||
@@ -12,22 +12,13 @@ using Serilog.Events;
|
|||||||
|
|
||||||
namespace PepperDash.Essentials.Core
|
namespace PepperDash.Essentials.Core
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Represents a ComPortController
|
|
||||||
/// </summary>
|
|
||||||
public class ComPortController : Device, IBasicCommunicationWithStreamDebugging
|
public class ComPortController : Device, IBasicCommunicationWithStreamDebugging
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the StreamDebugging
|
|
||||||
/// </summary>
|
|
||||||
public CommunicationStreamDebugging StreamDebugging { get; private set; }
|
public CommunicationStreamDebugging StreamDebugging { get; private set; }
|
||||||
|
|
||||||
public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
|
public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
|
||||||
public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
|
public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the IsConnected
|
|
||||||
/// </summary>
|
|
||||||
public bool IsConnected { get { return true; } }
|
public bool IsConnected { get { return true; } }
|
||||||
|
|
||||||
ComPort Port;
|
ComPort Port;
|
||||||
@@ -125,10 +116,6 @@ namespace PepperDash.Essentials.Core
|
|||||||
if(!eventSubscribed) Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered");
|
if(!eventSubscribed) Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Deactivate method
|
|
||||||
/// </summary>
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override bool Deactivate()
|
public override bool Deactivate()
|
||||||
{
|
{
|
||||||
return Port.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
|
return Port.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
|
||||||
@@ -136,9 +123,6 @@ namespace PepperDash.Essentials.Core
|
|||||||
|
|
||||||
#region IBasicCommunication Members
|
#region IBasicCommunication Members
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// SendText method
|
|
||||||
/// </summary>
|
|
||||||
public void SendText(string text)
|
public void SendText(string text)
|
||||||
{
|
{
|
||||||
if (Port == null)
|
if (Port == null)
|
||||||
@@ -149,9 +133,6 @@ namespace PepperDash.Essentials.Core
|
|||||||
Port.Send(text);
|
Port.Send(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// SendBytes method
|
|
||||||
/// </summary>
|
|
||||||
public void SendBytes(byte[] bytes)
|
public void SendBytes(byte[] bytes)
|
||||||
{
|
{
|
||||||
if (Port == null)
|
if (Port == null)
|
||||||
@@ -163,16 +144,10 @@ namespace PepperDash.Essentials.Core
|
|||||||
Port.Send(text);
|
Port.Send(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Connect method
|
|
||||||
/// </summary>
|
|
||||||
public void Connect()
|
public void Connect()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Disconnect method
|
|
||||||
/// </summary>
|
|
||||||
public void Disconnect()
|
public void Disconnect()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@@ -183,9 +158,6 @@ namespace PepperDash.Essentials.Core
|
|||||||
///
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="s"></param>
|
/// <param name="s"></param>
|
||||||
/// <summary>
|
|
||||||
/// SimulateReceive method
|
|
||||||
/// </summary>
|
|
||||||
public void SimulateReceive(string s)
|
public void SimulateReceive(string s)
|
||||||
{
|
{
|
||||||
// split out hex chars and build string
|
// split out hex chars and build string
|
||||||
|
|||||||
@@ -34,9 +34,8 @@ namespace PepperDash.Essentials.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// CanConvert method
|
///
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <inheritdoc />
|
|
||||||
public override bool CanConvert(Type objectType)
|
public override bool CanConvert(Type objectType)
|
||||||
{
|
{
|
||||||
return objectType == typeof(ComPort.ComPortSpec?);
|
return objectType == typeof(ComPort.ComPortSpec?);
|
||||||
@@ -45,15 +44,10 @@ namespace PepperDash.Essentials.Core
|
|||||||
public override bool CanRead { get { return true; } }
|
public override bool CanRead { get { return true; } }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the CanWrite
|
/// This converter will not be used for writing
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <inheritdoc />
|
|
||||||
public override bool CanWrite { get { return false; } }
|
public override bool CanWrite { get { return false; } }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// WriteJson method
|
|
||||||
/// </summary>
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
@@ -61,11 +55,12 @@ namespace PepperDash.Essentials.Core
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a ComSpecPropsJsonConverter
|
/// The gist of this converter: The comspec JSON comes in with normal values that need to be converted
|
||||||
|
/// into enum names. This converter takes the value and applies the appropriate enum's name prefix to the value
|
||||||
|
/// and then returns the enum value using Enum.Parse. NOTE: Does not write
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ComSpecPropsJsonConverter : JsonConverter
|
public class ComSpecPropsJsonConverter : JsonConverter
|
||||||
{
|
{
|
||||||
/// <inheritdoc />
|
|
||||||
public override bool CanConvert(Type objectType)
|
public override bool CanConvert(Type objectType)
|
||||||
{
|
{
|
||||||
return objectType == typeof(ComPort.eComBaudRates)
|
return objectType == typeof(ComPort.eComBaudRates)
|
||||||
@@ -77,15 +72,8 @@ namespace PepperDash.Essentials.Core
|
|||||||
|| objectType == typeof(ComPort.eComStopBits);
|
|| objectType == typeof(ComPort.eComStopBits);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the CanRead
|
|
||||||
/// </summary>
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override bool CanRead { get { return true; } }
|
public override bool CanRead { get { return true; } }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ReadJson method
|
|
||||||
/// </summary>
|
|
||||||
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
|
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
|
||||||
{
|
{
|
||||||
//Debug.LogMessage(LogEventLevel.Verbose, "ReadJson type: " + objectType.Name);
|
//Debug.LogMessage(LogEventLevel.Verbose, "ReadJson type: " + objectType.Name);
|
||||||
@@ -106,10 +94,6 @@ namespace PepperDash.Essentials.Core
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// WriteJson method
|
|
||||||
/// </summary>
|
|
||||||
/// <inheritdoc />
|
|
||||||
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user