From 2b06672800ca8a899871dcbe58afb3b6909369d8 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Fri, 17 Jul 2020 23:09:50 -0600 Subject: [PATCH] Figuring out where things are broke... --- .../UI/EssentialsTouchpanelController.cs | 2 +- .../UIDrivers/IHasCalendarButton.cs | 4 +++- .../EssentialsHuddleSpaceFusionController.cs | 19 +++++++++++++++++++ .../PepperDash_Essentials_Core.csproj | 3 ++- .../Rooms/Types/EssentialsDualDisplayRoom.cs | 3 +-- .../Rooms/Types/EssentialsHuddleSpaceRoom.cs | 3 +-- .../Rooms/Types/EssentialsHuddleVtc1Room.cs | 2 +- 7 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionController.cs diff --git a/PepperDashEssentials/UI/EssentialsTouchpanelController.cs b/PepperDashEssentials/UI/EssentialsTouchpanelController.cs index 146198e7..52816fac 100644 --- a/PepperDashEssentials/UI/EssentialsTouchpanelController.cs +++ b/PepperDashEssentials/UI/EssentialsTouchpanelController.cs @@ -287,7 +287,7 @@ namespace PepperDash.Essentials avDriver.SetVideoCodecDriver(codecDriver); avDriver.DefaultRoomKey = props.DefaultRoomKey; mainDriver.AvDriver = avDriver; - avDriver.CurrentRoom = room as EssentialsHuddleVtc1Room; + avDriver.CurrentRoom = room as EssentialsDualDisplayRoom; // Environment Driver if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0) diff --git a/PepperDashEssentials/UIDrivers/IHasCalendarButton.cs b/PepperDashEssentials/UIDrivers/IHasCalendarButton.cs index b4fe652c..952e16b8 100644 --- a/PepperDashEssentials/UIDrivers/IHasCalendarButton.cs +++ b/PepperDashEssentials/UIDrivers/IHasCalendarButton.cs @@ -1,4 +1,6 @@ -namespace PepperDash.Essentials +using PepperDash.Essentials.Core; + +namespace PepperDash.Essentials { public interface IHasCalendarButton { diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionController.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionController.cs new file mode 100644 index 00000000..2588b05b --- /dev/null +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionController.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Crestron.SimplSharp; +using PepperDash.Essentials; +using PepperDash.Essentials.Core; +using PepperDash.Essentials.Core.Fusion; + +namespace PepperDash_Essentials_Core.Fusion +{ + public class EssentialsHuddleSpaceFusionController:EssentialsHuddleSpaceFusionSystemControllerBase + { + + public EssentialsHuddleSpaceFusionController(EssentialsHuddleSpaceRoom room, uint ipId) : base(room, ipId) + { + } + } +} \ No newline at end of file diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj index 06142847..cce30e3f 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj @@ -225,7 +225,8 @@ - + + diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs index 3c28862b..262de32f 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Linq; using PepperDash.Core; -using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Rooms.Config; using PepperDash_Essentials_Core.Devices; -namespace PepperDash.Essentials +namespace PepperDash.Essentials.Core { public class EssentialsDualDisplayRoom : EssentialsHuddleVtc1Room { diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleSpaceRoom.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleSpaceRoom.cs index eb332e98..2074b9ee 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleSpaceRoom.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleSpaceRoom.cs @@ -1,12 +1,11 @@ using System; using Newtonsoft.Json; using PepperDash.Core; -using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Rooms; using PepperDash.Essentials.Core.Rooms.Config; -namespace PepperDash.Essentials +namespace PepperDash.Essentials.Core { public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IRunRouteAction, IRunDefaultPresentRoute, IHasCurrentVolumeControls, IHasDefaultDisplay, IHasCurrentSourceInfoChange diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleVtc1Room.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleVtc1Room.cs index a68bcf8a..9b7ee331 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleVtc1Room.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleVtc1Room.cs @@ -9,7 +9,7 @@ using PepperDash.Essentials.Core.Devices.VideoCodec; using PepperDash.Essentials.Core.Rooms; using PepperDash.Essentials.Core.Rooms.Config; -namespace PepperDash.Essentials +namespace PepperDash.Essentials.Core { public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange, IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec,