diff --git a/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericDigitalInputDevice.cs b/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericDigitalInputDevice.cs index d7720920..8ca01833 100644 --- a/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericDigitalInputDevice.cs +++ b/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericDigitalInputDevice.cs @@ -9,9 +9,9 @@ namespace PepperDash.Essentials.Core.Crestron_IO { public class GenericDigitalInputDevice : IDigitalInput { - DigitalInput InputPort { get; private set; } + public DigitalInput InputPort { get; private set; } - BoolFeedback InputStateFeedback { get; private set; } + public BoolFeedback InputStateFeedback { get; private set; } Func InputStateFeedbackFunc { @@ -35,5 +35,6 @@ namespace PepperDash.Essentials.Core.Crestron_IO { InputStateFeedback.FireUpdate(); } + } } \ No newline at end of file diff --git a/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericVersiportInputDevice.cs b/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericVersiportInputDevice.cs index a7103c68..d3455a69 100644 --- a/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericVersiportInputDevice.cs +++ b/Essentials Core/PepperDashEssentialsBase/Crestron IO/Inputs/GenericVersiportInputDevice.cs @@ -12,9 +12,9 @@ namespace PepperDash.Essentials.Core.Crestron_IO /// public class GenericVersiportInputDevice : IDigitalInput { - Versiport InputPort { get; private set; } + public Versiport InputPort { get; private set; } - BoolFeedback InputStateFeedback { get; private set; } + public BoolFeedback InputStateFeedback { get; private set; } Func InputStateFeedbackFunc { diff --git a/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/GenericRelayDevice.cs b/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/GenericRelayDevice.cs index 94bf1cc7..35347c92 100644 --- a/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/GenericRelayDevice.cs +++ b/Essentials Core/PepperDashEssentialsBase/Crestron IO/Relay/GenericRelayDevice.cs @@ -12,7 +12,7 @@ namespace PepperDash.Essentials.Core.Crestron_IO /// public class GenericRelayDevice { - Relay RelayOutput { get; private set; } + public Relay RelayOutput { get; private set; } public BoolFeedback RelayStateFeedback { get; private set; } @@ -39,17 +39,17 @@ namespace PepperDash.Essentials.Core.Crestron_IO RelayStateFeedback.FireUpdate(); } - void OpenRelay() + public void OpenRelay() { RelayOutput.State = false; } - void CloseRelay() + public void CloseRelay() { RelayOutput.State = true; } - void ToggleRelayState() + public void ToggleRelayState() { if (RelayOutput.State == true) OpenRelay(); diff --git a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj index 4ca18905..e5050466 100644 --- a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj +++ b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj @@ -109,7 +109,6 @@ - diff --git a/Essentials DM/Essentials_DM/Essentials_DM.csproj b/Essentials DM/Essentials_DM/Essentials_DM.csproj index c9a05d42..0377548e 100644 --- a/Essentials DM/Essentials_DM/Essentials_DM.csproj +++ b/Essentials DM/Essentials_DM/Essentials_DM.csproj @@ -57,7 +57,7 @@ False - ..\..\..\pepperdash-simplsharp-core\Pepperdash Core\CLZ Builds\PepperDash_Core.dll + ..\..\..\PepperDash.Core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll False diff --git a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj index 991e2d08..39f4a0f0 100644 --- a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj +++ b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj @@ -61,11 +61,7 @@ False - ..\..\..\pepperdash-simplsharp-core\Pepperdash Core\CLZ Builds\PepperDash_Core.dll - - - False - ..\..\Essentials Core\PepperDashEssentialsBase\bin\PepperDash_Essentials_Core.dll + ..\..\..\PepperDash.Core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll False @@ -123,6 +119,7 @@ + @@ -154,6 +151,12 @@ + + + {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} + PepperDash_Essentials_Core + + diff --git a/Essentials Core/PepperDashEssentialsBase/Microphone Privacy/MicrophonePrivacyController.cs b/Essentials Devices Common/Essentials Devices Common/Microphones/MicrophonePrivacyController.cs similarity index 76% rename from Essentials Core/PepperDashEssentialsBase/Microphone Privacy/MicrophonePrivacyController.cs rename to Essentials Devices Common/Essentials Devices Common/Microphones/MicrophonePrivacyController.cs index 070e47a6..0e8f365f 100644 --- a/Essentials Core/PepperDashEssentialsBase/Microphone Privacy/MicrophonePrivacyController.cs +++ b/Essentials Devices Common/Essentials Devices Common/Microphones/MicrophonePrivacyController.cs @@ -4,9 +4,12 @@ using System.Linq; using System.Text; using Crestron.SimplSharp; +using PepperDash.Core; +using PepperDash.Essentials.Core; using PepperDash.Essentials.Core.Crestron_IO; -namespace PepperDash.Essentials.Core.Microphone_Privacy + +namespace PepperDash.Essentials.Devices.Common.Microphones { public class MicrophonePrivacyController { @@ -18,8 +21,6 @@ namespace PepperDash.Essentials.Core.Microphone_Privacy public IPrivacy PrivacyDevice { get; private set; } - - public MicrophonePrivacyController(IPrivacy privacyDevice) { PrivacyDevice = privacyDevice; @@ -33,7 +34,10 @@ namespace PepperDash.Essentials.Core.Microphone_Privacy { var privacyState = (sender as IPrivacy).PrivacyModeIsOnFeedback.BoolValue; - if(privacyState) + if (privacyState) + TurnOnRedLeds(); + else + TurnOnGreenLeds(); } @@ -82,5 +86,23 @@ namespace PepperDash.Essentials.Core.Microphone_Privacy { PrivacyDevice.PrivacyModeToggle(); } + + void TurnOnRedLeds() + { + GreenLedRelay.OpenRelay(); + RedLedRelay.CloseRelay(); + } + + void TurnOnGreenLeds() + { + RedLedRelay.CloseRelay(); + GreenLedRelay.OpenRelay(); + } + + void TurnOffAllLeds() + { + GreenLedRelay.OpenRelay(); + RedLedRelay.OpenRelay(); + } } } \ No newline at end of file diff --git a/Essentials/PepperDashEssentials/PepperDashEssentials.csproj b/Essentials/PepperDashEssentials/PepperDashEssentials.csproj index fe29995d..ec9505eb 100644 --- a/Essentials/PepperDashEssentials/PepperDashEssentials.csproj +++ b/Essentials/PepperDashEssentials/PepperDashEssentials.csproj @@ -70,10 +70,6 @@ False ..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll - - False - ..\..\Essentials Devices Common\Essentials Devices Common\bin\Essentials Devices Common.dll - False @@ -201,6 +197,12 @@ + + + {892B761C-E479-44CE-BD74-243E9214AF13} + Essentials Devices Common + + diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz index 4dd408f3..f1562bc5 100644 Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll index 80dd7a13..d0ea2f17 100644 Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ