pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-16 13:15:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes to EiscApi loader

Browse Source
This commit is contained in:
Andrew Welker
2020-04-16 14:23:24 -06:00
parent 717b9b272c
commit 5329d7f931
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PepperDashEssentials/PepperDashEssentials.csproj
View File

@@ -125,7 +125,6 @@
<Compile Include="AppServer\SIMPLJoinMaps\MobileControlSIMPLRoomJoinMap.cs" /> <Compile Include="AppServer\SIMPLJoinMaps\MobileControlSIMPLRoomJoinMap.cs" />
<Compile Include="Audio\EssentialsVolumeLevelConfig.cs" /> <Compile Include="Audio\EssentialsVolumeLevelConfig.cs" />
<Compile Include="Bridges\BridgeFactory.cs" /> <Compile Include="Bridges\BridgeFactory.cs" />
<Compile Include="Bridges\IBridge.cs" />
<Compile Include="Factory\DeviceFactory.cs" /> <Compile Include="Factory\DeviceFactory.cs" />
<Compile Include="Devices\Amplifier.cs" /> <Compile Include="Devices\Amplifier.cs" />
<Compile Include="ControlSystem.cs" /> <Compile Include="ControlSystem.cs" />

9
essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/BridgeBase.cs
View File

@@ -119,11 +119,10 @@ namespace PepperDash.Essentials.Core.Bridges
continue; continue;
} }
if (device.GetType().GetCType().IsAssignableFrom(typeof (IBridgeAdvanced))) if (!device.GetType().GetCType().IsAssignableFrom(typeof (IBridgeAdvanced))) continue;
{
var bridge = device as IBridgeAdvanced; var bridgeAdvanced = device as IBridgeAdvanced;
if (bridge != null) bridge.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this); if (bridgeAdvanced != null) bridgeAdvanced.LinkToApi(Eisc, d.JoinStart, d.JoinMapKey, this);
}
//if (device is IBridge) // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type. //if (device is IBridge) // Check for this first to allow bridges in plugins to override existing bridges that apply to the same type.
//{ //{