pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-04-12 03:57:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development' into feature/dmps-dm-fixes

Browse source
This commit is contained in:
Andrew Welker 2023-02-17 09:07:13 -07:00 • committed by GitHub
commit 058b3820be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 3283 additions and 532 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PepperDashEssentials/ControlSystem.cs
View file

@ -13,6 +13,7 @@ using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Bridges;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Fusion;
using PepperDash.Essentials.Core.Web;
using PepperDash.Essentials.Devices.Common;
using PepperDash.Essentials.DM;
using PepperDash.Essentials.Fusion;
@ -357,6 +358,7 @@ namespace PepperDash.Essentials
// Build the processor wrapper class
DeviceManager.AddDevice(new PepperDash.Essentials.Core.Devices.CrestronProcessor("processor"));
DeviceManager.AddDevice(new EssemtialsWebApi("essentialsWebApi","Essentials Web API"));
// Add global System Monitor device
if (CrestronEnvironment.DevicePlatform == eDevicePlatform.Appliance)

2
PepperDashEssentials/Room/Types/EssentialsTechRoom.cs
View file

@ -272,7 +272,7 @@ namespace PepperDash.Essentials
{
Debug.Console(2, this,
@"Attempting to run action:
DeviceKey: {0}
Key: {0}
MethodName: {1}
Params: {2}"
, a.DeviceKey, a.MethodName, a.Params);