diff --git a/PepperDashEssentials/PepperDashEssentials.suo b/PepperDashEssentials/PepperDashEssentials.suo
index a85185f4..77ef5316 100644
Binary files a/PepperDashEssentials/PepperDashEssentials.suo and b/PepperDashEssentials/PepperDashEssentials.suo differ
diff --git a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo
index 8a01b7ff..4177c02f 100644
Binary files a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo and b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo differ
diff --git a/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-08 12-42-19).log b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-08 12-42-19).log
new file mode 100644
index 00000000..23aba703
--- /dev/null
+++ b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-08 12-42-19).log
@@ -0,0 +1,49 @@
+2/8/2017 12:42:19 PM, Info: Initializing SIMPLSharp Services...
+2/8/2017 12:42:19 PM, Info: ProjectInfo successfully initialized.
+2/8/2017 1:05:56 PM, Info: Saving project information...
+2/8/2017 1:05:56 PM, Info: Saving project information...
+2/8/2017 1:05:56 PM, Info: Saving project information...
+2/8/2017 1:05:56 PM, Info: Saving project information...
+2/8/2017 1:05:56 PM, Info: Saving project information...
+2/8/2017 1:05:56 PM, Info: Saving project information...
+2/8/2017 1:06:09 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
+2/8/2017 1:06:10 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
+2/8/2017 1:06:10 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
+2/8/2017 1:06:11 PM, Info: Saving project information...
+2/8/2017 2:04:40 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
+2/8/2017 2:04:40 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
+2/8/2017 2:04:40 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
+2/8/2017 2:04:42 PM, Info: Saving project information...
+2/8/2017 2:32:10 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
+2/8/2017 2:32:10 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
+2/8/2017 2:32:10 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
+2/8/2017 2:32:12 PM, Info: Saving project information...
+2/8/2017 2:38:27 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
+2/8/2017 2:38:27 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
+2/8/2017 2:38:27 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
+2/8/2017 2:38:29 PM, Info: Saving project information...
+2/8/2017 2:41:17 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
+2/8/2017 2:41:18 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
+2/8/2017 2:41:18 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
+2/8/2017 2:41:19 PM, Info: Saving project information...
+2/8/2017 2:43:49 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
+2/8/2017 2:43:49 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
+2/8/2017 2:43:49 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
+2/8/2017 2:43:51 PM, Info: Saving project information...
+2/8/2017 2:44:11 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
+2/8/2017 2:44:12 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
+2/8/2017 2:44:12 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
+2/8/2017 2:44:13 PM, Info: Saving project information...
+2/8/2017 2:52:31 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
+2/8/2017 2:52:31 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
+2/8/2017 2:52:32 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
+2/8/2017 2:52:33 PM, Info: Saving project information...
+2/8/2017 3:09:44 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
+2/8/2017 3:09:44 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
+2/8/2017 3:09:45 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
+2/8/2017 3:09:46 PM, Info: Saving project information...
+2/8/2017 3:16:21 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll...
+2/8/2017 3:16:22 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll
+2/8/2017 3:16:22 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz...
+2/8/2017 3:16:23 PM, Info: Saving project information...
+2/8/2017 3:59:21 PM, Info: Terminating SIMPLSharp Services
diff --git a/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs b/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs
index a68ebd6b..3c1c7f1f 100644
--- a/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs
+++ b/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsHuddlePanelAvFunctionsDriver.cs
@@ -80,6 +80,12 @@ namespace PepperDash.Essentials
}
EssentialsHuddleSpaceRoom _CurrentRoom;
+ ///
+ /// For hitting feedback
+ ///
+ BoolInputSig ShareButtonSig;
+ BoolInputSig EndMeetingButtonSig;
+
///
/// Controls the extended period that the volume gauge shows on-screen,
/// as triggered by Volume up/down operations
@@ -279,8 +285,10 @@ namespace PepperDash.Essentials
ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(1, ActivityFooterSrl, 0, b =>
{
if (b) return; // ignore press
+ ShareButtonSig = ActivityFooterSrl.BoolInputSig(1, 1);
if (!_CurrentRoom.OnFeedback.BoolValue)
{
+ ShareButtonSig.BoolValue = true;
TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true;
}
@@ -301,6 +309,7 @@ namespace PepperDash.Essentials
3, b => { if (!b) PowerButtonPressed(); }));
ActivityFooterSrl.Count = 2;
TriList.UShortInput[UIUshortJoin.PresentationListCaretMode].UShortValue = 1;
+ EndMeetingButtonSig = ActivityFooterSrl.BoolInputSig(2, 1);
}
///
@@ -406,14 +415,21 @@ namespace PepperDash.Essentials
{
if (!CurrentRoom.OnFeedback.BoolValue)
return;
+ EndMeetingButtonSig.BoolValue = true;
+ ShareButtonSig.BoolValue = false;
// Timeout or button 1 press will shut down
var modal = new ModalDialog(TriList);
uint time = 60000;
uint seconds = time / 1000;
var message = string.Format("Meeting will end in {0} seconds", seconds);
- modal.PresentModalTimerDialog(2, "End Meeting", "Info", message,
+ modal.PresentModalTimerDialog(2, "End Meeting", "Power", message,
"End Meeting Now", "Cancel", time, true,
- but => { if (but != 2) CurrentRoom.RunRouteAction("roomOff"); });
+ but =>
+ {
+ if (but != 2)
+ CurrentRoom.RunRouteAction("roomOff");
+ EndMeetingButtonSig.BoolValue = false;
+ });
}
void CancelPowerOffTimer()
diff --git a/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPanelMainInterfaceDriver.cs b/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPanelMainInterfaceDriver.cs
index 2ba978ad..d7e141d3 100644
--- a/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPanelMainInterfaceDriver.cs
+++ b/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPanelMainInterfaceDriver.cs
@@ -52,15 +52,6 @@ namespace PepperDash.Essentials
TriList.SetSigFalseAction(UIBoolJoin.HelpPress, () =>
{
- //var modal = new ModalDialog(TriList);
- //var room = DeviceManager.GetDeviceForKey(Config.DefaultRoomKey)
- // as EssentialsHuddleSpaceRoom;
- //string message = "Sorry, no help message available. No room connected.";
- //if(room != null)
- // message = room.Config.HelpMessage;
- //modal.PresentModalTimerDialog(1, "Help", "Help", message,
- // "Done", null, 0, false, null);
-
string message = null;
var room = DeviceManager.GetDeviceForKey(Config.DefaultRoomKey)
as EssentialsHuddleSpaceRoom;
@@ -68,13 +59,10 @@ namespace PepperDash.Essentials
message = room.Config.HelpMessage;
else
message = "Sorry, no help message available. No room connected.";
-
+ TriList.StringInput[UIStringJoin.HelpMessage].StringValue = message;
if (HelpDriver == null)
HelpDriver = new SingleSubpageModalDriver(this, UIBoolJoin.HelpPageVisible, UIBoolJoin.HelpClosePress);
- if (HelpDriver.IsVisible)
- HelpDriver.Hide();
- else
- HelpDriver.Show();
+ HelpDriver.Toggle();
});
diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz
index e0e38c95..ed7f742f 100644
Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz differ
diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll
index 1aa538af..057cd352 100644
Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.dll differ
diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb
index 5a3680e4..5e3ffaf1 100644
Binary files a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb and b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.pdb differ
diff --git a/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config b/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config
index f1d8a617..90af2b84 100644
--- a/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config
+++ b/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config
@@ -10,8 +10,8 @@
- 2/8/2017 2:44:12 PM
- 1.0.0.26524
+ 2/8/2017 3:16:22 PM
+ 1.0.0.27489
Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10
diff --git a/PepperDashEssentials/PepperDashEssentials/bin/manifest.info b/PepperDashEssentials/PepperDashEssentials/bin/manifest.info
index aa744a45..e80543cd 100644
--- a/PepperDashEssentials/PepperDashEssentials/bin/manifest.info
+++ b/PepperDashEssentials/PepperDashEssentials/bin/manifest.info
@@ -1,4 +1,4 @@
-MainAssembly=PepperDashEssentials.dll:16286fc87faa5656107cc7d7753daf7a
+MainAssembly=PepperDashEssentials.dll:2da047fb96fb025c52a872139c06d7c2
MainAssemblyMinFirmwareVersion=1.009.0029
MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e
ü
diff --git a/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser b/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser
index 4a12ff36..6ac922f4 100644
Binary files a/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser and b/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser differ
diff --git a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll
index 85b1a537..68f3e3cf 100644
Binary files a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll and b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.dll differ
diff --git a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb
index 52283be4..063a2b3c 100644
Binary files a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb and b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb differ