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

minor fixes to allow build to succeed.

Browse source
This commit is contained in:
Neil Dorin 2021-01-19 17:04:06 -07:00
parent 7404566f72
commit c262e7c3c5
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
PepperDashEssentials/ControlSystem.cs
View file

@ -439,14 +439,13 @@ namespace PepperDash.Essentials
} }
else else
{ {
room = new ComponentRoom(roomConfig) room = new ComponentRoom(roomConfig);
} }
if (room != null && room is EssentialsRoomBase) if (room != null && room is EssentialsRoomBase)
{ {
if (room is EssentialsHuddleSpaceRoom) if (room is EssentialsHuddleSpaceRoom)
{ {
DeviceManager.AddDevice(room);
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion"); Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleSpaceRoom, attempting to add to DeviceManager with Fusion");
DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase((EssentialsHuddleSpaceRoom)room, 0xf1)); DeviceManager.AddDevice(new Core.Fusion.EssentialsHuddleSpaceFusionSystemControllerBase((EssentialsHuddleSpaceRoom)room, 0xf1));
@ -458,7 +457,6 @@ namespace PepperDash.Essentials
} }
else if (room is EssentialsHuddleVtc1Room) else if (room is EssentialsHuddleVtc1Room)
{ {
DeviceManager.AddDevice(room);
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion"); Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is EssentialsHuddleVtc1Room, attempting to add to DeviceManager with Fusion");
DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, 0xf1)); DeviceManager.AddDevice(new EssentialsHuddleVtc1FusionController((EssentialsHuddleVtc1Room)room, 0xf1));
@ -470,13 +468,11 @@ namespace PepperDash.Essentials
else else
{ {
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is NOT EssentialsRoom, attempting to add to DeviceManager w/o Fusion"); Debug.Console(0, Debug.ErrorLogLevel.Notice, "Room is NOT EssentialsRoom, attempting to add to DeviceManager w/o Fusion");
DeviceManager.AddDevice(room);
} }
} }
else if (room != null && room is ComponentRoom) else if (room != null)
{ {
DeviceManager.AddDevice(room);
} }
else else
Debug.Console(0, Debug.ErrorLogLevel.Notice, "Notice: Cannot create room from config, key '{0}' - Is this intentional? This may be a valid configuration.", roomConfig.Key); Debug.Console(0, Debug.ErrorLogLevel.Notice, "Notice: Cannot create room from config, key '{0}' - Is this intentional? This may be a valid configuration.", roomConfig.Key);

2
essentials-framework/Essentials Core/PepperDashEssentialsBase/Room/Components/ComponentFactory.cs
View file

@ -35,7 +35,7 @@ namespace PepperDash.Essentials.Core.Room.Components
public static class ComponentFactory public static class ComponentFactory
{ {
public static ComponentFactory() static ComponentFactory()
{ {
var assy = Assembly.GetExecutingAssembly(); var assy = Assembly.GetExecutingAssembly();
PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy); PluginLoader.SetEssentialsAssembly(assy.GetName().Name, assy);