Gear button and setup page

This commit is contained in:
Heath Volmer
2017-08-23 21:28:33 -06:00
parent f87e0a7888
commit 78529a4d56
8 changed files with 28 additions and 14 deletions

View File

@@ -153,7 +153,6 @@ namespace PepperDash.Essentials.Devices.Displays
/// / /// /
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param>
void Communication_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e) void Communication_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e)
{ {
// This is probably not thread-safe buffering // This is probably not thread-safe buffering
@@ -228,16 +227,19 @@ namespace PepperDash.Essentials.Devices.Displays
IncomingBuffer = newBytes; IncomingBuffer = newBytes;
} }
/// <summary>
///
/// </summary>
void UpdatePowerFB(byte pb) void UpdatePowerFB(byte pb)
{ {
var newVal = pb == 1; var newVal = pb == 1;
Debug.Console(2, this, "NEW POWER STATE={0}, CURRENT={1}", newVal, _PowerIsOn); Debug.Console(2, this, "*#* NEW POWER STATE={0}, CURRENT={1}", newVal, _PowerIsOn);
if (newVal != _PowerIsOn) if (newVal != _PowerIsOn)
{ {
CrestronInvoke.BeginInvoke(o => CrestronInvoke.BeginInvoke(o =>
{ {
CrestronEnvironment.Sleep(1500); CrestronEnvironment.Sleep(2500);
Debug.Console(2, this, "NEW POWER STATE AFTER PAUSE={0} CURRENT={1}", newVal, _PowerIsOn); Debug.Console(2, this, "*#* NEW POWER STATE AFTER PAUSE={0} CURRENT={1}", newVal, _PowerIsOn);
if (newVal != _PowerIsOn) if (newVal != _PowerIsOn)
{ {
_PowerIsOn = newVal; _PowerIsOn = newVal;
@@ -250,7 +252,6 @@ namespace PepperDash.Essentials.Devices.Displays
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
/// <param name="b"></param>
void UpdateVolumeFB(byte b) void UpdateVolumeFB(byte b)
{ {
var newVol = (ushort)Scale((double)b, 0, 100, 0, 65535); var newVol = (ushort)Scale((double)b, 0, 100, 0, 65535);
@@ -263,6 +264,9 @@ namespace PepperDash.Essentials.Devices.Displays
} }
} }
/// <summary>
///
/// </summary>
void UpdateMuteFb(byte b) void UpdateMuteFb(byte b)
{ {
var newMute = b == 1; var newMute = b == 1;
@@ -273,6 +277,9 @@ namespace PepperDash.Essentials.Devices.Displays
} }
} }
/// <summary>
///
/// </summary>
void UpdateInputFb(byte b) void UpdateInputFb(byte b)
{ {
var newInput = InputPorts.FirstOrDefault(i => i.FeedbackMatchObject.Equals(b)); var newInput = InputPorts.FirstOrDefault(i => i.FeedbackMatchObject.Equals(b));
@@ -334,6 +341,9 @@ namespace PepperDash.Essentials.Devices.Displays
} }
} }
/// <summary>
///
/// </summary>
public override void PowerOff() public override void PowerOff()
{ {
// If a display has unreliable-power off feedback, just override this and // If a display has unreliable-power off feedback, just override this and

View File

@@ -216,13 +216,17 @@ namespace PepperDash.Essentials
// ShowInterlockedModal(UIBoolJoin.RoomHeaderPageVisible)); // ShowInterlockedModal(UIBoolJoin.RoomHeaderPageVisible));
#warning Add press and hold to gear button here #warning Add press and hold to gear button here
#warning Hide Gear on ipad for now #warning CHANGE BACK THIS JOIN NUMBER to GearHeaderButtonPress!!!!!!
TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = true; // Hold button
TriList.SetSigFalseAction(UIBoolJoin.GearHeaderButtonPress, () => TriList.SetSigTrueAction(UIBoolJoin.GearButtonVisible, () => { //GearHeaderButtonPress
ShowInterlockedModal(UIBoolJoin.TechPanelSetupVisible)); new CTimer(o => {
//ShowInterlockedModal(UIBoolJoin.VolumesPageVisible)); if (TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue) //GearHeaderButtonPress
ShowInterlockedModal(UIBoolJoin.TechPanelSetupVisible);
}, 2000);
});
TriList.SetSigFalseAction(UIBoolJoin.TechPagesExitButton, () => TriList.SetSigFalseAction(UIBoolJoin.TechPagesExitButton, () =>
HideCurrentInterlockedModal()); HideCurrentInterlockedModal());
TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = true;
// power-related functions // power-related functions
// Note: some of these are not directly-related to the huddle space UI, but are held over // Note: some of these are not directly-related to the huddle space UI, but are held over
@@ -357,9 +361,11 @@ namespace PepperDash.Essentials
HideCurrentInterlockedModal(); HideCurrentInterlockedModal();
else else
{ {
// sets the sig true if the join is right
TriList.BooleanInput[UIBoolJoin.HelpPageVisible].BoolValue = join == UIBoolJoin.HelpPageVisible; TriList.BooleanInput[UIBoolJoin.HelpPageVisible].BoolValue = join == UIBoolJoin.HelpPageVisible;
TriList.BooleanInput[UIBoolJoin.RoomHeaderPageVisible].BoolValue = join == UIBoolJoin.RoomHeaderPageVisible; TriList.BooleanInput[UIBoolJoin.RoomHeaderPageVisible].BoolValue = join == UIBoolJoin.RoomHeaderPageVisible;
TriList.BooleanInput[UIBoolJoin.VolumesPageVisible].BoolValue = join == UIBoolJoin.VolumesPageVisible; TriList.BooleanInput[UIBoolJoin.VolumesPageVisible].BoolValue = join == UIBoolJoin.VolumesPageVisible;
TriList.BooleanInput[UIBoolJoin.TechPanelSetupVisible].BoolValue = join == UIBoolJoin.TechPanelSetupVisible;
CurrentInterlockedModalJoin = join; CurrentInterlockedModalJoin = join;
} }
} }
@@ -524,7 +530,7 @@ namespace PepperDash.Essentials
/// <param name="e"></param> /// <param name="e"></param>
void ShutdownPromptTimer_HasFinished(object sender, EventArgs e) void ShutdownPromptTimer_HasFinished(object sender, EventArgs e)
{ {
Debug.Console(2, "UI shutdown prompt finished"); Debug.Console(2, "*#*UI shutdown prompt finished");
EndMeetingButtonSig.BoolValue = false; EndMeetingButtonSig.BoolValue = false;
} }
@@ -535,11 +541,9 @@ namespace PepperDash.Essentials
/// <param name="e"></param> /// <param name="e"></param>
void ShutdownPromptTimer_WasCancelled(object sender, EventArgs e) void ShutdownPromptTimer_WasCancelled(object sender, EventArgs e)
{ {
Debug.Console(2, "UI shutdown prompt cancelled"); Debug.Console(2, "*#*UI shutdown prompt cancelled");
if (PowerDownModal != null) if (PowerDownModal != null)
PowerDownModal.HideDialog(); PowerDownModal.HideDialog();
//CurrentRoom_SyncOnFeedback();
//ShareButtonSig.BoolValue = true; // restore Share fb
EndMeetingButtonSig.BoolValue = false; EndMeetingButtonSig.BoolValue = false;
} }