From 4c9a470885d8a71878666cfffba11f6edcb5c92d Mon Sep 17 00:00:00 2001
From: jta <jalborough@pepperdash.com>
Date: Mon, 13 Jun 2022 13:22:23 -0500
Subject: [PATCH 1/2] Fix IBasicVolumeControls

fix: revert a change that split the interface but could break backwards compatibility #955
---
 .../Devices/IVolumeAndAudioInterfaces.cs                     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs
index 254eada2..c5fc185a 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs	
@@ -9,8 +9,11 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// Defines minimal volume and mute control methods
 	/// </summary>
-    public interface IBasicVolumeControls : IHasVolumeControl, IHasMuteControl
+    public interface IBasicVolumeControls 
 	{
+		void VolumeUp(bool pressRelease);
+		void VolumeDown(bool pressRelease);
+		void MuteToggle();
 	}
 
     /// <summary>

From 38c4a540a98ae2e5e5e870f00fb161fa8f3239fc Mon Sep 17 00:00:00 2001
From: jta <jalborough@pepperdash.com>
Date: Mon, 13 Jun 2022 13:01:04 -0500
Subject: [PATCH 2/2] fix for IBasicVolumeWithFeedback

fix: for a change that split the interface but could break backwards compatibility #955
---
 .../Devices/IVolumeAndAudioInterfaces.cs                   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs
index c5fc185a..c8a5df39 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs	
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs	
@@ -55,8 +55,13 @@ namespace PepperDash.Essentials.Core
 	/// <summary>
 	/// Adds feedback and direct volume level set to IBasicVolumeControls
 	/// </summary>
-    public interface IBasicVolumeWithFeedback : IBasicVolumeControls, IHasVolumeControlWithFeedback, IHasMuteControlWithFeedback
+    public interface IBasicVolumeWithFeedback : IBasicVolumeControls
 	{
+		BoolFeedback MuteFeedback { get; }
+        void MuteOn();
+        void MuteOff();
+		void SetVolume(ushort level);
+		IntFeedback VolumeLevelFeedback { get; }
 	}
 
     /// <summary>