diff --git a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs
index 7ee574a4..866bf344 100644
--- a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs
+++ b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs
@@ -1,8 +1,8 @@
using System.Reflection;
[assembly: AssemblyTitle("PepperDashEssentials")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("PepperDash Technology Corp")]
[assembly: AssemblyProduct("PepperDashEssentials")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
-[assembly: AssemblyVersion("1.0.0.*")]
+[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")]
+[assembly: AssemblyVersion("1.0.1.*")]
diff --git a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
index ae348e62..2fa0dce8 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
@@ -185,18 +185,11 @@ namespace PepperDash.Essentials
CTimer NextMeetingTimer;
- ///
- /// Tracks whether the user dismissed the meeting popup, while the system was on. Always false when
- /// system is off.
- ///
- bool NextMeetingWarningWasDismissed;
///
/// Tracks the last meeting that was cancelled
///
Meeting LastMeetingDismissed;
-
-
///
/// Constructor
///
@@ -439,9 +432,6 @@ namespace PepperDash.Essentials
// Every 60 seconds, check meetings list for the closest, joinable meeting
var ss = CurrentRoom.ScheduleSource;
var meetings = ss.CodecSchedule.Meetings;
- Debug.Console(0, "***** Checking meetings *****");
- foreach (var m in meetings)
- Debug.Console(0, "****** {0} {1} ******", m.StartTime.ToShortTimeString(), m.Joinable);
if (meetings.Count > 0)
{
@@ -453,16 +443,13 @@ namespace PepperDash.Essentials
if (CurrentRoom.OnFeedback.BoolValue
&& LastMeetingDismissed == meeting)
- //|| (LastMeetingDismissed != null && !LastMeetingDismissed.Joinable)))
{
- Debug.Console(0, "****** Ignoring previously cancelled meeting warning ******");
return;
}
LastMeetingDismissed = null;
if (meeting != null)
{
- Debug.Console(0, "***** First joinable meeting: {0} {1}", meeting.StartTime.ToShortTimeString(), meeting.Joinable);
TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToShortTimeString());
TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToShortTimeString());
@@ -980,20 +967,6 @@ namespace PepperDash.Essentials
TriList.SetSigFalseAction(UIBoolJoin.TechExitButton, () =>
PopupInterlock.HideAndClear());
- //HeaderGearButton = new HeaderListButton(HeaderButtonsList, 5);
- //HeaderGearButton.SetIcon(HeaderListButton.Gear);
- //HeaderGearButton.OutputSig.SetSigHeldAction(2000,
- // ShowTech,
- // null,
- // () =>
- // {
- // if (CurrentRoom.OnFeedback.BoolValue)
- // PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.VolumesPageVisible);
- // else
- // PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.VolumesPagePowerOffVisible);
- // });
-
-
// Help button and popup
if (CurrentRoom.Config.Help != null)
{
@@ -1025,36 +998,11 @@ namespace PepperDash.Essentials
//TriList.StringInput[UIStringJoin.HelpMessage].StringValue = message;
PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HelpPageVisible);
});
- //var helpButton = new HeaderListButton(HeaderButtonsList, 4);
- //helpButton.SetIcon(HeaderListButton.Help);
- //helpButton.OutputSig.SetSigFalseAction(() =>
- //{
- // string message = null;
- // var room = DeviceManager.GetDeviceForKey(Config.DefaultRoomKey)
- // as EssentialsHuddleSpaceRoom;
- // if (room != null)
- // message = room.Config.HelpMessage;
- // else
- // message = "Sorry, no help message available. No room connected.";
- // //TriList.StringInput[UIStringJoin.HelpMessage].StringValue = message;
- // PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HelpPageVisible);
- //});
uint nextJoin = 3953;
- // Lights button
- //if (WHATEVER MAKES LIGHTS WORK)
- //{
- // // do lights
- // nextIndex--;
- //}
-
// Calendar button
- if (_CurrentRoom.ScheduleSource != null) // ******************* Do we need a config option here as well?
+ if (_CurrentRoom.ScheduleSource != null)
{
- //var calBut = new HeaderListButton(HeaderButtonsList, nextIndex);
- //calBut.SetIcon(HeaderListButton.Calendar);
- //calBut.OutputSig.SetSigFalseAction(CalendarPress);
-
TriList.SetString(nextJoin, "Calendar");
TriList.SetSigFalseAction(nextJoin, CalendarPress);
@@ -1062,10 +1010,6 @@ namespace PepperDash.Essentials
}
// Call button
- //HeaderCallButton = new HeaderListButton(HeaderButtonsList, nextJoin);
- //HeaderCallButton.SetIcon(HeaderListButton.OnHook);
- //HeaderCallButton.OutputSig.SetSigFalseAction(ShowActiveCallsList);
-
TriList.SetString(nextJoin, "DND");
TriList.SetSigFalseAction(nextJoin, ShowActiveCallsList);
HeaderCallButtonIconSig = TriList.StringInput[nextJoin];
@@ -1075,15 +1019,10 @@ namespace PepperDash.Essentials
// blank any that remain
for (var i = nextJoin; i > 3950; i--)
{
- //var blankBut = new HeaderListButton(HeaderButtonsList, i);
- //blankBut.ClearIcon();
- //blankBut.OutputSig.SetSigFalseAction(() => { });
-
TriList.SetString(i, "Blank");
TriList.SetSigFalseAction(i, () => { });
}
-
TriList.SetSigFalseAction(UIBoolJoin.HeaderCallStatusLabelPress, ShowActiveCallsList);
// Set Call Status Subpage Position
@@ -1101,7 +1040,6 @@ namespace PepperDash.Essentials
TriList.SetBool(UIBoolJoin.HeaderCallStatusRightPositionVisible, false);
}
-
HeaderButtonsAreSetUp = true;
ComputeHeaderCallStatus(CurrentRoom.VideoCodec);
@@ -1318,8 +1256,6 @@ namespace PepperDash.Essentials
(previousDev as IPower).UnlinkButtons(TriList);
if (previousDev is ITransport)
(previousDev as ITransport).UnlinkButtons(TriList);
- //if (previousDev is IRadio)
- // (previousDev as IRadio).UnlinkButtons(this);
}
///
diff --git a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
index c416914f..a4496a34 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
@@ -663,7 +663,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
///
void RefreshDirectory()
{
- Debug.Console(0, "****** RefreshDirectory!");
if (CurrentDirectoryResult.DirectoryResults.Count > 0)
{
ushort i = 0;
diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz
index f50874fa..db7c8ab6 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 09f67dc6..1b60fd39 100644
Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ