Merge pull request #1178 from PepperDash/feature-2.0.0/interface-updates

Multiple Updates

.gitignore

@@ -390,3 +390,4 @@ MigrationBackup/
 FodyWeavers.xsd
 essentials-framework/Essentials Interfaces/PepperDash_Essentials_Interfaces/PepperDash_Essentials_Interfaces.csproj
 .DS_Store
+/._PepperDash.Essentials.sln

src/PepperDash.Essentials.Core/Devices/IVolumeAndAudioInterfaces.cs

@@ -64,6 +64,24 @@ namespace PepperDash.Essentials.Core
 		IntFeedback VolumeLevelFeedback { get; }
 	}
 
+	/// <summary>
+	/// Adds the ability to display a raw volume level and the units of that level
+	/// </summary>
+	public interface IBasicVolumeWithFeedbackAdvanced : IBasicVolumeWithFeedback
+	{
+		int RawVolumeLevel { get; }
+
+		eVolumeLevelUnits Units { get; }
+	}
+
+    public enum eVolumeLevelUnits
+    {
+        Decibels,
+        Percent,
+        Relative,
+        Absolute
+    }
+
     /// <summary>
     /// A class that implements this contains a reference to a current IBasicVolumeControls device.
     /// The class may have multiple IBasicVolumeControls.

src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj

@@ -23,7 +23,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-beta-400" />
+    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-402" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />

src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs

@@ -210,6 +210,10 @@ namespace PepperDash.Essentials.Room.Config
         /// </summary>
         [JsonProperty("userCanChangeShareMode")]
         public bool UserCanChangeShareMode { get; set; }
+
+
+        [JsonProperty("matrixRoutingKey", NullValueHandling = NullValueHandling.Ignore)]
+        public string MatrixRoutingKey { get; set; }
     }
 
     public class EssentialsConferenceRoomPropertiesConfig : EssentialsAvRoomPropertiesConfig
@@ -218,6 +222,7 @@ namespace PepperDash.Essentials.Room.Config
         public string VideoCodecKey { get; set; }
         [JsonProperty("audioCodecKey")]
         public string AudioCodecKey { get; set; }
+
     }
 
 	public class EssentialsEnvironmentPropertiesConfig

src/PepperDash.Essentials.Core/Room/Interfaces.cs

@@ -50,6 +50,34 @@ namespace PepperDash.Essentials.Core
     {
         void RunDirectRoute(string sourceKey, string destinationKey, eRoutingSignalType type = eRoutingSignalType.AudioVideo);
     }
+    
+    /// <summary>
+    /// Describes a room with matrix routing
+    /// </summary>
+    public interface IHasMatrixRouting
+    {
+        string MatrixRoutingDeviceKey { get; }
+
+        List<string> EndpointKeys { get; }
+    }
+
+    /// <summary>
+    /// Describes a room with routing endpoints
+    /// </summary>
+    public interface IHasRoutingEndpoints
+    {
+        List<string> EndpointKeys { get; }
+    }
+
+    /// <summary>
+    /// Describes a room with a shutdown prompt timer
+    /// </summary>
+    public interface IShutdownPromptTimer
+    {
+        SecondsCountdownTimer ShutdownPromptTimer { get; }
+
+        void SetShutdownPromptSeconds(int seconds);
+    }
 
     /// <summary>
     /// For rooms that default presentation only routing

src/PepperDash.Essentials.Core/Routing/IRoutingInputSlot.cs

@@ -1,10 +1,4 @@
-using System;
+namespace PepperDash.Essentials.Core.Routing
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PepperDash.Essentials.Core.Routing
 {
     public interface IRoutingInputSlot: IRoutingSlot, IOnline, IVideoSync
     {

src/PepperDash.Essentials.Core/Routing/IRoutingOutputSlot.cs

@@ -3,12 +3,12 @@ using System.Collections.Generic;
 
 namespace PepperDash.Essentials.Core.Routing
 {
-    public interface IRoutingOutputSlot:IRoutingSlot
+    public interface IRoutingOutputSlot : IRoutingSlot
     {
         event EventHandler OutputSlotChanged;
 
         string RxDeviceKey { get; }
 
         Dictionary<eRoutingSignalType, IRoutingInputSlot> CurrentRoutes { get; }
-    }
+    }    
 }

src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs

@@ -26,7 +26,6 @@ namespace PepperDash.Essentials.Devices.Common.Displays
             {
                 return () =>
                     {
-                        Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** Display Power is {0}", _PowerIsOn ? "on" : "off");
                         return _PowerIsOn;
                     };
         } }
@@ -36,7 +35,6 @@ namespace PepperDash.Essentials.Devices.Common.Displays
             {
                 return () =>
                 {
-                    Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** {0}", _IsCoolingDown ? "Display is cooling down" : "Display has finished cooling down");
                     return _IsCoolingDown;
                 };
             }
@@ -47,7 +45,6 @@ namespace PepperDash.Essentials.Devices.Common.Displays
             {
                 return () =>
                 {
-                    Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** {0}", _IsWarmingUp ? "Display is warming up" : "Display has finished warming up");
                     return _IsWarmingUp;
                 };
             }

src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj

@@ -27,6 +27,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-beta-400" />
+    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-402" />
   </ItemGroup>
 </Project>

src/PepperDash.Essentials.Devices.Common/Room/IEssentialsRoomPropertiesConfig.cs

@@ -0,0 +1,14 @@
+using PepperDash.Essentials.Room.Config;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Devices.Common.Room
+{
+    public interface IEssentialsRoomPropertiesConfig
+    {
+        EssentialsRoomPropertiesConfig PropertiesConfig { get; }
+    }
+}

src/PepperDash.Essentials/PepperDash.Essentials.csproj

@@ -47,7 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.20.42" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-beta-400" />
+    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-402" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />