pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 12:44:58 +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 //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 // 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 = new UsageTracking(display) {UsageIsTracked = true};
display.UsageTracker.DeviceUsageEnded += display.UsageTracker.DeviceUsageEnded +=
@@ -1276,7 +1276,7 @@ namespace PepperDash.Essentials.Core.Fusion
return; return;
} }
var defaultDisplay = hasDefaultDisplay.DefaultDisplay as DisplayBase; var defaultDisplay = hasDefaultDisplay.DefaultDisplay as TwoWayDisplayBase;
if (defaultDisplay == null) if (defaultDisplay == null)
{ {
Debug.Console(1, this, "Cannot link null display to Fusion because default display is 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="display"></param>
/// <param name="displayIndex"></param> /// <param name="displayIndex"></param>
/// a /// 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); 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(); base.SetUpDisplay();
var defaultDisplay = _room.DefaultDisplay as DisplayBase; var defaultDisplay = _room.DefaultDisplay as TwoWayDisplayBase;
if (defaultDisplay == null) if (defaultDisplay == null)
{ {

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

@@ -186,19 +186,17 @@
<Compile Include="Device Info\DeviceInfo.cs" /> <Compile Include="Device Info\DeviceInfo.cs" />
<Compile Include="Device Info\DeviceInfoEventArgs.cs" /> <Compile Include="Device Info\DeviceInfoEventArgs.cs" />
<Compile Include="Device Info\IDeviceInfoProvider.cs" /> <Compile Include="Device Info\IDeviceInfoProvider.cs" />
<Compile Include="Devices\AudioCodecBase.cs" />
<Compile Include="Devices\CodecInterfaces.cs" />
<Compile Include="Devices\Base Classes\AudioCodecBase.cs" /> <Compile Include="Devices\Base Classes\AudioCodecBase.cs" />
<Compile Include="Devices\Base Classes\EssentialsBridgeableDevice.cs" />
<Compile Include="Devices\Base Classes\EssentialsDevice.cs" />
<Compile Include="Devices\Interfaces\CodecInterfaces.cs" /> <Compile Include="Devices\Interfaces\CodecInterfaces.cs" />
<Compile Include="Devices\CrestronProcessor.cs" /> <Compile Include="Devices\CrestronProcessor.cs" />
<Compile Include="Devices\DestinationListItem.cs" /> <Compile Include="Devices\DestinationListItem.cs" />
<Compile Include="Devices\Base Classes\DeviceApiBase.cs" /> <Compile Include="Devices\Base Classes\DeviceApiBase.cs" />
<Compile Include="Devices\DeviceFeedbackExtensions.cs" /> <Compile Include="Devices\DeviceFeedbackExtensions.cs" />
<Compile Include="Devices\EssentialsBridgeableDevice.cs" />
<Compile Include="Devices\EssentialsDevice.cs" />
<Compile Include="Devices\GenericIRController.cs" /> <Compile Include="Devices\GenericIRController.cs" />
<Compile Include="Devices\IDspPreset.cs" /> <Compile Include="Devices\IDspPreset.cs" />
<Compile Include="Devices\IProjectorInterfaces.cs" /> <Compile Include="Devices\Interfaces\IProjectorInterfaces.cs" />
<Compile Include="Devices\PC\InRoomPc.cs" /> <Compile Include="Devices\PC\InRoomPc.cs" />
<Compile Include="Devices\PC\Laptop.cs" /> <Compile Include="Devices\PC\Laptop.cs" />
<Compile Include="Devices\Base Classes\ReconfigurableDevice.cs" /> <Compile Include="Devices\Base Classes\ReconfigurableDevice.cs" />

6
essentials-framework/Essentials Core/PepperDashEssentialsBase/Rooms/EssentialsRoomBase.cs
View File

@@ -241,7 +241,7 @@ namespace PepperDash.Essentials.Core
ShutdownType = eShutdownType.None; ShutdownType = eShutdownType.None;
} }
protected void InitializeDisplay(DisplayBase display) protected void InitializeDisplay(TwoWayDisplayBase display)
{ {
// Link power, warming, cooling to display // Link power, warming, cooling to display
display.PowerIsOnFeedback.OutputChange += PowerIsOnFeedbackOnOutputChange; display.PowerIsOnFeedback.OutputChange += PowerIsOnFeedbackOnOutputChange;
@@ -615,9 +615,9 @@ namespace PepperDash.Essentials.Core
if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase)) if (route.SourceKey.Equals("$off", StringComparison.OrdinalIgnoreCase))
{ {
dest.ReleaseRoute(); dest.ReleaseRoute();
if (dest is IPower) if (dest is IHasPowerControl)
{ {
(dest as IPower).PowerOff(); (dest as IHasPowerControl).PowerOff();
} }
} }
else else

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

@@ -210,8 +210,8 @@ namespace PepperDash.Essentials
return; return;
} }
var leftDisplay = leftDest.SinkDevice as DisplayBase; var leftDisplay = leftDest.SinkDevice as TwoWayDisplayBase;
var rightDisplay = rightDest.SinkDevice as DisplayBase; var rightDisplay = rightDest.SinkDevice as TwoWayDisplayBase;
if (leftDisplay == null || rightDisplay == null) if (leftDisplay == null || rightDisplay == null)
{ {
@@ -279,8 +279,8 @@ namespace PepperDash.Essentials
protected override void PowerIsOnFeedbackOnOutputChange(object sender, FeedbackEventArgs args) protected override void PowerIsOnFeedbackOnOutputChange(object sender, FeedbackEventArgs args)
{ {
var ld = LeftDisplay as DisplayBase; var ld = LeftDisplay as TwoWayDisplayBase;
var rd = RightDisplay as DisplayBase; var rd = RightDisplay as TwoWayDisplayBase;
if (ld == null || rd == null) if (ld == null || rd == null)
{ {

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

@@ -52,7 +52,7 @@ namespace PepperDash.Essentials
EnablePowerOnToLastSource = true; EnablePowerOnToLastSource = true;
var disp = DefaultDisplay as DisplayBase; var disp = DefaultDisplay as TwoWayDisplayBase;
if (disp == null) if (disp == null)
{ {
return; return;
@@ -75,7 +75,7 @@ namespace PepperDash.Essentials
protected override void PowerIsOnFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs) protected override void PowerIsOnFeedbackOnOutputChange(object sender, FeedbackEventArgs feedbackEventArgs)
{ {
var display = sender as DisplayBase; var display = sender as TwoWayDisplayBase;
if (display == null) if (display == null)
{ {

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

@@ -195,7 +195,7 @@ namespace PepperDash.Essentials
SourceListKey = "default"; SourceListKey = "default";
EnablePowerOnToLastSource = true; EnablePowerOnToLastSource = true;
var disp = DefaultDisplay as DisplayBase; var disp = DefaultDisplay as TwoWayDisplayBase;
if (disp == null) if (disp == null)
{ {
return; return;
@@ -272,7 +272,7 @@ namespace PepperDash.Essentials
protected override void PowerIsOnFeedbackOnOutputChange(object sender, FeedbackEventArgs args) protected override void PowerIsOnFeedbackOnOutputChange(object sender, FeedbackEventArgs args)
{ {
var disp = sender as DisplayBase; var disp = sender as TwoWayDisplayBase;
if (disp == null) if (disp == null)
{ {

1
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodecPropertiesConfig.cs
View File

@@ -8,6 +8,7 @@ using PepperDash.Core;
using PepperDash.Essentials.Core; using PepperDash.Essentials.Core;
using Newtonsoft.Json; using Newtonsoft.Json;
using PepperDash.Essentials.Core.Devices.Codec;
namespace PepperDash.Essentials.Devices.Common.Codec namespace PepperDash.Essentials.Devices.Common.Codec
{ {

1
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs
View File

@@ -11,7 +11,6 @@ using PepperDash.Essentials.Core.Devices.Codec;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {

2
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs
View File

@@ -12,10 +12,12 @@ using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Bridges; using PepperDash.Essentials.Core.Bridges;
using PepperDash.Essentials.Core.Config; using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Devices.VideoCodec; using PepperDash.Essentials.Core.Devices.VideoCodec;
using PepperDash.Essentials.Core.DeviceTypeInterfaces;
using PepperDash.Essentials.Core.Routing; using PepperDash.Essentials.Core.Routing;
using PepperDash.Essentials.Devices.Common.Cameras; using PepperDash.Essentials.Devices.Common.Cameras;
using PepperDash.Essentials.Core.Devices.Codec; using PepperDash.Essentials.Core.Devices.Codec;
using PepperDash.Essentials.Devices.Core.VideoCodec; using PepperDash.Essentials.Devices.Core.VideoCodec;
using PepperDash_Essentials_Core.DeviceTypeInterfaces;
namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
{ {