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

Figuring out where things are broke...

Browse Source
This commit is contained in:
Andrew Welker
2020-07-17 23:09:50 -06:00
parent 68f6cf95b9
commit 2b06672800
7 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PepperDashEssentials/UI/EssentialsTouchpanelController.cs
View File

@@ -287,7 +287,7 @@ namespace PepperDash.Essentials
avDriver.SetVideoCodecDriver(codecDriver); avDriver.SetVideoCodecDriver(codecDriver);
avDriver.DefaultRoomKey = props.DefaultRoomKey; avDriver.DefaultRoomKey = props.DefaultRoomKey;
mainDriver.AvDriver = avDriver; mainDriver.AvDriver = avDriver;
avDriver.CurrentRoom = room as EssentialsHuddleVtc1Room; avDriver.CurrentRoom = room as EssentialsDualDisplayRoom;
// Environment Driver // Environment Driver
if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0) if (avDriver.CurrentRoom.PropertiesConfig.Environment != null && avDriver.CurrentRoom.PropertiesConfig.Environment.DeviceKeys.Count > 0)

4
PepperDashEssentials/UIDrivers/IHasCalendarButton.cs
View File

@@ -1,4 +1,6 @@
namespace PepperDash.Essentials using PepperDash.Essentials.Core;
namespace PepperDash.Essentials
{ {
public interface IHasCalendarButton public interface IHasCalendarButton
{ {

19
essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionController.cs Normal file
View File

@@ -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)
{
}
}
}

3
essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
View File

@@ -225,7 +225,8 @@
<Compile Include="Feedbacks\SerialFeedback.cs" /> <Compile Include="Feedbacks\SerialFeedback.cs" />
<Compile Include="Feedbacks\StringFeedback.cs" /> <Compile Include="Feedbacks\StringFeedback.cs" />
<Compile Include="Fusion\EssentialsDualDisplayFusionController.cs" /> <Compile Include="Fusion\EssentialsDualDisplayFusionController.cs" />
<Compile Include="Fusion\EssentialsHuddleSpaceFusionSystemControllerBase.cs" /> <Compile Include="Fusion\EssentialsFusionSystemControllerBase.cs" />
<Compile Include="Fusion\EssentialsHuddleSpaceFusionController.cs" />
<Compile Include="Fusion\EssentialsHuddleVtc1FusionController.cs" /> <Compile Include="Fusion\EssentialsHuddleVtc1FusionController.cs" />
<Compile Include="Fusion\FusionCustomPropertiesBridge.cs" /> <Compile Include="Fusion\FusionCustomPropertiesBridge.cs" />
<Compile Include="Fusion\FusionEventHandlers.cs" /> <Compile Include="Fusion\FusionEventHandlers.cs" />

3
essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsDualDisplayRoom.cs
View File

@@ -2,12 +2,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using PepperDash.Core; using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Rooms.Config; using PepperDash.Essentials.Core.Rooms.Config;
using PepperDash_Essentials_Core.Devices; using PepperDash_Essentials_Core.Devices;
namespace PepperDash.Essentials namespace PepperDash.Essentials.Core
{ {
public class EssentialsDualDisplayRoom : EssentialsHuddleVtc1Room public class EssentialsDualDisplayRoom : EssentialsHuddleVtc1Room
{ {

3
essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleSpaceRoom.cs
View File

@@ -1,12 +1,11 @@
using System; using System;
using Newtonsoft.Json; using Newtonsoft.Json;
using PepperDash.Core; using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Rooms; using PepperDash.Essentials.Core.Rooms;
using PepperDash.Essentials.Core.Rooms.Config; using PepperDash.Essentials.Core.Rooms.Config;
namespace PepperDash.Essentials namespace PepperDash.Essentials.Core
{ {
public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IRunRouteAction, public class EssentialsHuddleSpaceRoom : EssentialsRoomBase, IRunRouteAction,
IRunDefaultPresentRoute, IHasCurrentVolumeControls, IHasDefaultDisplay, IHasCurrentSourceInfoChange IRunDefaultPresentRoute, IHasCurrentVolumeControls, IHasDefaultDisplay, IHasCurrentSourceInfoChange

2
essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/Types/EssentialsHuddleVtc1Room.cs
View File

@@ -9,7 +9,7 @@ using PepperDash.Essentials.Core.Devices.VideoCodec;
using PepperDash.Essentials.Core.Rooms; using PepperDash.Essentials.Core.Rooms;
using PepperDash.Essentials.Core.Rooms.Config; using PepperDash.Essentials.Core.Rooms.Config;
namespace PepperDash.Essentials namespace PepperDash.Essentials.Core
{ {
public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange, public class EssentialsHuddleVtc1Room : EssentialsRoomBase, IHasCurrentSourceInfoChange,
IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec, IPrivacy, IHasCurrentVolumeControls, IRunRouteAction, IRunDefaultCallRoute, IHasVideoCodec, IHasAudioCodec,