mirror of
https://github.com/PepperDash/Essentials.git
synced 2026-02-16 13:15:03 +00:00
Various ecs-213
This commit is contained in:
Heath Volmer
Binary file not shown.
Binary file not shown.
@@ -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
|
||||||
@@ -80,6 +80,12 @@ namespace PepperDash.Essentials
|
|||||||
}
|
}
|
||||||
EssentialsHuddleSpaceRoom _CurrentRoom;
|
EssentialsHuddleSpaceRoom _CurrentRoom;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// For hitting feedback
|
||||||
|
/// </summary>
|
||||||
|
BoolInputSig ShareButtonSig;
|
||||||
|
BoolInputSig EndMeetingButtonSig;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Controls the extended period that the volume gauge shows on-screen,
|
/// Controls the extended period that the volume gauge shows on-screen,
|
||||||
/// as triggered by Volume up/down operations
|
/// as triggered by Volume up/down operations
|
||||||
@@ -279,8 +285,10 @@ namespace PepperDash.Essentials
|
|||||||
ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(1, ActivityFooterSrl, 0, b =>
|
ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(1, ActivityFooterSrl, 0, b =>
|
||||||
{
|
{
|
||||||
if (b) return; // ignore press
|
if (b) return; // ignore press
|
||||||
|
ShareButtonSig = ActivityFooterSrl.BoolInputSig(1, 1);
|
||||||
if (!_CurrentRoom.OnFeedback.BoolValue)
|
if (!_CurrentRoom.OnFeedback.BoolValue)
|
||||||
{
|
{
|
||||||
|
ShareButtonSig.BoolValue = true;
|
||||||
TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
|
TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false;
|
||||||
TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true;
|
TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true;
|
||||||
}
|
}
|
||||||
@@ -301,6 +309,7 @@ namespace PepperDash.Essentials
|
|||||||
3, b => { if (!b) PowerButtonPressed(); }));
|
3, b => { if (!b) PowerButtonPressed(); }));
|
||||||
ActivityFooterSrl.Count = 2;
|
ActivityFooterSrl.Count = 2;
|
||||||
TriList.UShortInput[UIUshortJoin.PresentationListCaretMode].UShortValue = 1;
|
TriList.UShortInput[UIUshortJoin.PresentationListCaretMode].UShortValue = 1;
|
||||||
|
EndMeetingButtonSig = ActivityFooterSrl.BoolInputSig(2, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -406,14 +415,21 @@ namespace PepperDash.Essentials
|
|||||||
{
|
{
|
||||||
if (!CurrentRoom.OnFeedback.BoolValue)
|
if (!CurrentRoom.OnFeedback.BoolValue)
|
||||||
return;
|
return;
|
||||||
|
EndMeetingButtonSig.BoolValue = true;
|
||||||
|
ShareButtonSig.BoolValue = false;
|
||||||
// Timeout or button 1 press will shut down
|
// Timeout or button 1 press will shut down
|
||||||
var modal = new ModalDialog(TriList);
|
var modal = new ModalDialog(TriList);
|
||||||
uint time = 60000;
|
uint time = 60000;
|
||||||
uint seconds = time / 1000;
|
uint seconds = time / 1000;
|
||||||
var message = string.Format("Meeting will end in {0} seconds", seconds);
|
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,
|
"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()
|
void CancelPowerOffTimer()
|
||||||
|
|||||||
@@ -52,15 +52,6 @@ namespace PepperDash.Essentials
|
|||||||
|
|
||||||
TriList.SetSigFalseAction(UIBoolJoin.HelpPress, () =>
|
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;
|
string message = null;
|
||||||
var room = DeviceManager.GetDeviceForKey(Config.DefaultRoomKey)
|
var room = DeviceManager.GetDeviceForKey(Config.DefaultRoomKey)
|
||||||
as EssentialsHuddleSpaceRoom;
|
as EssentialsHuddleSpaceRoom;
|
||||||
@@ -68,13 +59,10 @@ namespace PepperDash.Essentials
|
|||||||
message = room.Config.HelpMessage;
|
message = room.Config.HelpMessage;
|
||||||
else
|
else
|
||||||
message = "Sorry, no help message available. No room connected.";
|
message = "Sorry, no help message available. No room connected.";
|
||||||
|
TriList.StringInput[UIStringJoin.HelpMessage].StringValue = message;
|
||||||
if (HelpDriver == null)
|
if (HelpDriver == null)
|
||||||
HelpDriver = new SingleSubpageModalDriver(this, UIBoolJoin.HelpPageVisible, UIBoolJoin.HelpClosePress);
|
HelpDriver = new SingleSubpageModalDriver(this, UIBoolJoin.HelpPageVisible, UIBoolJoin.HelpClosePress);
|
||||||
if (HelpDriver.IsVisible)
|
HelpDriver.Toggle();
|
||||||
HelpDriver.Hide();
|
|
||||||
else
|
|
||||||
HelpDriver.Show();
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -10,8 +10,8 @@
|
|||||||
<ArchiveName />
|
<ArchiveName />
|
||||||
</RequiredInfo>
|
</RequiredInfo>
|
||||||
<OptionalInfo>
|
<OptionalInfo>
|
||||||
<CompiledOn>2/8/2017 2:44:12 PM</CompiledOn>
|
<CompiledOn>2/8/2017 3:16:22 PM</CompiledOn>
|
||||||
<CompilerRev>1.0.0.26524</CompilerRev>
|
<CompilerRev>1.0.0.27489</CompilerRev>
|
||||||
</OptionalInfo>
|
</OptionalInfo>
|
||||||
<Plugin>
|
<Plugin>
|
||||||
<Version>Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>
|
<Version>Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
MainAssembly=PepperDashEssentials.dll:16286fc87faa5656107cc7d7753daf7a
|
MainAssembly=PepperDashEssentials.dll:2da047fb96fb025c52a872139c06d7c2
|
||||||
MainAssemblyMinFirmwareVersion=1.009.0029
|
MainAssemblyMinFirmwareVersion=1.009.0029
|
||||||
MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e
|
MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e
|
||||||
ü
|
ü
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user