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

Adds IBridgeAdvanced and updates to 1.0.35 of PepperDash.Core

Browse source
This commit is contained in:
Neil Dorin 2020-04-03 18:21:17 -06:00
parent 3a101d89ea
commit 9d7f5af26e
5 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
PepperDashEssentials/Bridges/BridgeBase.cs
View file

@ -124,6 +124,10 @@ namespace PepperDash.Essentials.Bridges
(device as IBridge).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey); (device as IBridge).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
continue; continue;
} }
else if (device is IBridgeAdvanced)
{
(device as IBridgeAdvanced).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
}
else if (device is PepperDash.Essentials.Core.Monitoring.SystemMonitorController) else if (device is PepperDash.Essentials.Core.Monitoring.SystemMonitorController)
{ {
(device as PepperDash.Essentials.Core.Monitoring.SystemMonitorController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey); (device as PepperDash.Essentials.Core.Monitoring.SystemMonitorController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
@ -139,16 +143,18 @@ namespace PepperDash.Essentials.Bridges
(device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this); (device as CameraBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
continue; continue;
} }
else if (device is PepperDash.Essentials.Core.DisplayBase) else if (device is PepperDash.Essentials.Core.DisplayBase)
{ {
(device as DisplayBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey); (device as DisplayBase).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
continue; continue;
} }
else if (device is DmChassisController) { else if (device is DmChassisController)
{
(device as DmChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey); (device as DmChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
continue; continue;
} }
else if (device is DmBladeChassisController) { else if (device is DmBladeChassisController)
{
(device as DmBladeChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey); (device as DmBladeChassisController).LinkToApi(Eisc, d.JoinStart, d.JoinMapKey);
continue; continue;
} }

10
PepperDashEssentials/Bridges/IBridge.cs
View file

@ -7,10 +7,20 @@ using Crestron.SimplSharpPro.DeviceSupport;
namespace PepperDash.Essentials.Bridges namespace PepperDash.Essentials.Bridges
{ {
/// <summary>
/// Defines a device that uses the legacy JoinMapBase for its join map
/// </summary>
[Obsolete("IBridgeAdvanced should be used going forward with JoinMapBaseAdvanced")]
public interface IBridge public interface IBridge
{ {
void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey); void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey);
}
/// <summary>
/// Defines a device that uses JoinMapBaseAdvanced for its join map
/// </summary>
public interface IBridgeAdvanced
{
void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge); void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApi bridge);
} }
} }

2
PepperDashEssentials/ControlSystem.cs
View file

@ -51,7 +51,7 @@ namespace PepperDash.Essentials
CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Core.DeviceFactory.GetDeviceFactoryTypes, "gettypes", "Gets the device types that can be built. Accepts a filter string.", ConsoleAccessLevelEnum.AccessOperator); CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Core.DeviceFactory.GetDeviceFactoryTypes, "gettypes", "Gets the device types that can be built. Accepts a filter string.", ConsoleAccessLevelEnum.AccessOperator);
CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Bridges.BridgeHelper.PrintJoinMap, "getjoinmap", "gets map(s) for bridge or device on bridge [brKey [devKey]]", ConsoleAccessLevelEnum.AccessOperator); CrestronConsole.AddNewConsoleCommand(PepperDash.Essentials.Bridges.BridgeHelper.PrintJoinMap, "getjoinmap", "map(s) for bridge or device on bridge [brKey [devKey]]", ConsoleAccessLevelEnum.AccessOperator);
CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.AddNewConsoleCommand(s =>
{ {

1
essentials-framework/Essentials Core/PepperDashEssentialsBase/Plugins/PluginLoader.cs
View file

@ -8,7 +8,6 @@ using Crestron.SimplSharp.Reflection;
using PepperDash.Core; using PepperDash.Core;
using PepperDash.Essentials.Core; using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Plugins;
namespace PepperDash.Essentials namespace PepperDash.Essentials
{ {

2
essentials-framework/pepperdashcore-builds

@ -1 +1 @@
Subproject commit acebe6b43b28cc3a93f899e9714292a0cc1ab2cc Subproject commit 15206840b3e6338f695e4ffba634a72e51ea1be5