mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-04-12 12:06:58 +00:00
Added default source and volume levels recall to EndShutdown() methods in huddle and huddleVtc1 room types. Added mute control and feedback to Avocor display driver (using volume level discrete commands, no mute available in API).
This commit is contained in:
parent
07e77f2ce4
commit
f9cb4e8a34
5 changed files with 33 additions and 10 deletions
|
|
@ -67,9 +67,9 @@ namespace PepperDash.Essentials.Devices.Displays
|
||||||
bool _IsCoolingDown;
|
bool _IsCoolingDown;
|
||||||
ushort _VolumeLevelForSig;
|
ushort _VolumeLevelForSig;
|
||||||
int _LastVolumeSent;
|
int _LastVolumeSent;
|
||||||
|
ushort _PreMuteVolumeLevel;
|
||||||
bool _IsMuted;
|
bool _IsMuted;
|
||||||
RoutingInputPort _CurrentInputPort;
|
RoutingInputPort _CurrentInputPort;
|
||||||
//byte[] IncomingBuffer = new byte[]{};
|
|
||||||
ActionIncrementer VolumeIncrementer;
|
ActionIncrementer VolumeIncrementer;
|
||||||
bool VolumeIsRamping;
|
bool VolumeIsRamping;
|
||||||
public bool IsInStandby { get; private set; }
|
public bool IsInStandby { get; private set; }
|
||||||
|
|
@ -358,6 +358,14 @@ namespace PepperDash.Essentials.Devices.Displays
|
||||||
{
|
{
|
||||||
_VolumeLevelForSig = newVol;
|
_VolumeLevelForSig = newVol;
|
||||||
VolumeLevelFeedback.FireUpdate();
|
VolumeLevelFeedback.FireUpdate();
|
||||||
|
|
||||||
|
if (_VolumeLevelForSig > 0)
|
||||||
|
_IsMuted = false;
|
||||||
|
else
|
||||||
|
_IsMuted = true;
|
||||||
|
|
||||||
|
MuteFeedback.FireUpdate();
|
||||||
|
|
||||||
Debug.Console(1, this, "Volume Level: {0}", VolumeLevelFeedback.IntValue);
|
Debug.Console(1, this, "Volume Level: {0}", VolumeLevelFeedback.IntValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -635,7 +643,7 @@ namespace PepperDash.Essentials.Devices.Displays
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void MuteOff()
|
public void MuteOff()
|
||||||
{
|
{
|
||||||
SendBytes(new byte[] { 0xAA, 0x13, 0x00, 0x01, 0x00, 0x00 });
|
SetVolume(_PreMuteVolumeLevel);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
@ -643,16 +651,18 @@ namespace PepperDash.Essentials.Devices.Displays
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public void MuteOn()
|
public void MuteOn()
|
||||||
{
|
{
|
||||||
SendBytes(new byte[] { 0xAA, 0x13, 0x00, 0x01, 0x01, 0x00 });
|
_PreMuteVolumeLevel = _VolumeLevelForSig;
|
||||||
|
|
||||||
|
SetVolume(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
///// <summary>
|
||||||
///
|
/////
|
||||||
/// </summary>
|
///// </summary>
|
||||||
public void MuteGet()
|
//public void MuteGet()
|
||||||
{
|
//{
|
||||||
SendBytes(new byte[] { 0xAA, 0x13, 0x00, 0x00, 0x00 });
|
// SendBytes(new byte[] { 0x07, ID, 0x01, });
|
||||||
}
|
//}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -202,6 +202,12 @@ namespace PepperDash.Essentials
|
||||||
/// </summary>
|
/// </summary>
|
||||||
protected override void EndShutdown()
|
protected override void EndShutdown()
|
||||||
{
|
{
|
||||||
|
SetDefaultLevels();
|
||||||
|
|
||||||
|
RunDefaultRoute();
|
||||||
|
|
||||||
|
CrestronEnvironment.Sleep(200);
|
||||||
|
|
||||||
RunRouteAction("roomOff");
|
RunRouteAction("roomOff");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -265,6 +265,13 @@ namespace PepperDash.Essentials
|
||||||
protected override void EndShutdown()
|
protected override void EndShutdown()
|
||||||
{
|
{
|
||||||
VideoCodec.EndAllCalls();
|
VideoCodec.EndAllCalls();
|
||||||
|
|
||||||
|
SetDefaultLevels();
|
||||||
|
|
||||||
|
RunDefaultPresentRoute();
|
||||||
|
|
||||||
|
CrestronEnvironment.Sleep(200);
|
||||||
|
|
||||||
RunRouteAction("roomOff");
|
RunRouteAction("roomOff");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue