diff --git a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo index 6ce5f07e..6687287f 100644 Binary files a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo and b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo differ diff --git a/Essentials DM/Essentials_DM/Essentials_DM.projectinfo b/Essentials DM/Essentials_DM/Essentials_DM.projectinfo index dadb4199..3b775660 100644 Binary files a/Essentials DM/Essentials_DM/Essentials_DM.projectinfo and b/Essentials DM/Essentials_DM/Essentials_DM.projectinfo differ diff --git a/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs b/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs index ac4dc4ab..2e1c01d4 100644 --- a/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs +++ b/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs @@ -153,7 +153,6 @@ namespace PepperDash.Essentials.Devices.Displays /// / /// /// - /// void Communication_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e) { // This is probably not thread-safe buffering @@ -228,16 +227,19 @@ namespace PepperDash.Essentials.Devices.Displays IncomingBuffer = newBytes; } + /// + /// + /// void UpdatePowerFB(byte pb) { 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) { CrestronInvoke.BeginInvoke(o => { - CrestronEnvironment.Sleep(1500); - Debug.Console(2, this, "NEW POWER STATE AFTER PAUSE={0} CURRENT={1}", newVal, _PowerIsOn); + CrestronEnvironment.Sleep(2500); + Debug.Console(2, this, "*#* NEW POWER STATE AFTER PAUSE={0} CURRENT={1}", newVal, _PowerIsOn); if (newVal != _PowerIsOn) { _PowerIsOn = newVal; @@ -250,7 +252,6 @@ namespace PepperDash.Essentials.Devices.Displays /// /// /// - /// void UpdateVolumeFB(byte b) { var newVol = (ushort)Scale((double)b, 0, 100, 0, 65535); @@ -263,6 +264,9 @@ namespace PepperDash.Essentials.Devices.Displays } } + /// + /// + /// void UpdateMuteFb(byte b) { var newMute = b == 1; @@ -273,6 +277,9 @@ namespace PepperDash.Essentials.Devices.Displays } } + /// + /// + /// void UpdateInputFb(byte b) { var newInput = InputPorts.FirstOrDefault(i => i.FeedbackMatchObject.Equals(b)); @@ -334,6 +341,9 @@ namespace PepperDash.Essentials.Devices.Displays } } + /// + /// + /// public override void PowerOff() { // If a display has unreliable-power off feedback, just override this and diff --git a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo index a5764db7..645cb211 100644 Binary files a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo and b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo differ diff --git a/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo index 34f6adbc..23b936be 100644 Binary files a/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo and b/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo differ diff --git a/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs index cccb15a6..6efe1c0d 100644 --- a/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs +++ b/Essentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs @@ -216,13 +216,17 @@ namespace PepperDash.Essentials // ShowInterlockedModal(UIBoolJoin.RoomHeaderPageVisible)); #warning Add press and hold to gear button here -#warning Hide Gear on ipad for now - TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = true; - TriList.SetSigFalseAction(UIBoolJoin.GearHeaderButtonPress, () => - ShowInterlockedModal(UIBoolJoin.TechPanelSetupVisible)); - //ShowInterlockedModal(UIBoolJoin.VolumesPageVisible)); +#warning CHANGE BACK THIS JOIN NUMBER to GearHeaderButtonPress!!!!!! + // Hold button + TriList.SetSigTrueAction(UIBoolJoin.GearButtonVisible, () => { //GearHeaderButtonPress + new CTimer(o => { + if (TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue) //GearHeaderButtonPress + ShowInterlockedModal(UIBoolJoin.TechPanelSetupVisible); + }, 2000); + }); TriList.SetSigFalseAction(UIBoolJoin.TechPagesExitButton, () => HideCurrentInterlockedModal()); + TriList.BooleanInput[UIBoolJoin.GearButtonVisible].BoolValue = true; // power-related functions // 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(); else { + // sets the sig true if the join is right TriList.BooleanInput[UIBoolJoin.HelpPageVisible].BoolValue = join == UIBoolJoin.HelpPageVisible; TriList.BooleanInput[UIBoolJoin.RoomHeaderPageVisible].BoolValue = join == UIBoolJoin.RoomHeaderPageVisible; TriList.BooleanInput[UIBoolJoin.VolumesPageVisible].BoolValue = join == UIBoolJoin.VolumesPageVisible; + TriList.BooleanInput[UIBoolJoin.TechPanelSetupVisible].BoolValue = join == UIBoolJoin.TechPanelSetupVisible; CurrentInterlockedModalJoin = join; } } @@ -524,7 +530,7 @@ namespace PepperDash.Essentials /// void ShutdownPromptTimer_HasFinished(object sender, EventArgs e) { - Debug.Console(2, "UI shutdown prompt finished"); + Debug.Console(2, "*#*UI shutdown prompt finished"); EndMeetingButtonSig.BoolValue = false; } @@ -535,11 +541,9 @@ namespace PepperDash.Essentials /// void ShutdownPromptTimer_WasCancelled(object sender, EventArgs e) { - Debug.Console(2, "UI shutdown prompt cancelled"); + Debug.Console(2, "*#*UI shutdown prompt cancelled"); if (PowerDownModal != null) PowerDownModal.HideDialog(); - //CurrentRoom_SyncOnFeedback(); - //ShareButtonSig.BoolValue = true; // restore Share fb EndMeetingButtonSig.BoolValue = false; } diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz index ea33ac22..a9b7eb6f 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 d2e8bfcd..cad1c140 100644 Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ