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

updates to get things back working

Browse Source
This commit is contained in:
Andrew Welker
2020-11-19 08:00:17 -07:00
parent 97995df962
commit 7b3ef897fb
10 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleSpaceFusionSystemControllerBase.cs
View File

@@ -1259,11 +1259,11 @@ namespace PepperDash.Essentials.Core.Fusion
{
//Setup Display Usage Monitoring
var displays = DeviceManager.AllDevices.Where(d => d is DisplayBase);
var displays = DeviceManager.AllDevices.Where(d => d is TwoWayDisplayBase);
// Consider updating this in multiple display systems
foreach (var display in displays.Cast<DisplayBase>())
foreach (var display in displays.Cast<TwoWayDisplayBase>())
{
display.UsageTracker = new UsageTracking(display) {UsageIsTracked = true};
display.UsageTracker.DeviceUsageEnded +=
@@ -1276,7 +1276,7 @@ namespace PepperDash.Essentials.Core.Fusion
return;
}
var defaultDisplay = hasDefaultDisplay.DefaultDisplay as DisplayBase;
var defaultDisplay = hasDefaultDisplay.DefaultDisplay as TwoWayDisplayBase;
if (defaultDisplay == null)
{
Debug.Console(1, this, "Cannot link null display to Fusion because default display is null");
@@ -1326,7 +1326,7 @@ namespace PepperDash.Essentials.Core.Fusion
/// <param name="display"></param>
/// <param name="displayIndex"></param>
/// a
protected virtual void MapDisplayToRoomJoins(int displayIndex, int joinOffset, DisplayBase display)
protected virtual void MapDisplayToRoomJoins(int displayIndex, int joinOffset, TwoWayDisplayBase display)
{
var displayName = string.Format("Display {0} - ", displayIndex);

2
essentials-framework/Essentials Core/PepperDashEssentialsBase/Fusion/EssentialsHuddleVtc1FusionController.cs
View File

@@ -154,7 +154,7 @@ namespace PepperDash.Essentials.Core.Fusion
{
base.SetUpDisplay();
var defaultDisplay = _room.DefaultDisplay as DisplayBase;
var defaultDisplay = _room.DefaultDisplay as TwoWayDisplayBase;
if (defaultDisplay == null)
{