diff --git a/PepperDashEssentials/PepperDashEssentials.suo b/PepperDashEssentials/PepperDashEssentials.suo index f890a65a..df9faf83 100644 Binary files a/PepperDashEssentials/PepperDashEssentials.suo and b/PepperDashEssentials/PepperDashEssentials.suo differ diff --git a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj index 0baeb2b1..6630f746 100644 --- a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.csproj @@ -154,8 +154,8 @@ - + diff --git a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo index e7f55d0e..ec71b748 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo and b/PepperDashEssentials/PepperDashEssentials/PepperDashEssentials.projectinfo differ diff --git a/PepperDashEssentials/PepperDashEssentials/Room/EssentialsPresentationRoom.cs b/PepperDashEssentials/PepperDashEssentials/Room/EssentialsPresentationRoom.cs index 71868b89..7d64111a 100644 --- a/PepperDashEssentials/PepperDashEssentials/Room/EssentialsPresentationRoom.cs +++ b/PepperDashEssentials/PepperDashEssentials/Room/EssentialsPresentationRoom.cs @@ -16,15 +16,11 @@ namespace PepperDash.Essentials public EssentialsPresentationRoomPropertiesConfig Config { get; private set; } - public Dictionary Displays { get; private set; } + public Dictionary Displays { get; private set; } - public IRoutingSinkWithSwitching Display1 { get; private set; } - public IRoutingSinkWithSwitching Display2 { get; private set; } public IRoutingSinkNoSwitching DefaultAudioDevice { get; private set; } public IBasicVolumeControls DefaultVolumeControls { get; private set; } - public bool ExcludeFromGlobalFunctions { get; set; } - /// /// The config name of the source list /// @@ -36,6 +32,18 @@ namespace PepperDash.Essentials public bool EnablePowerOnToLastSource { get; set; } string LastSourceKey; + public enum eVideoRoutingMode + { + SelectSourceSelectDisplay, SourceToAllDisplays + } + + public eVideoRoutingMode VideoRoutingMode { get; set; } + + public enum eAudioRoutingMode + { + AudioFollowsLastVideo, SelectAudioFromDisplay + } + /// /// /// @@ -103,13 +111,12 @@ namespace PepperDash.Essentials /// /// public EssentialsPresentationRoom(string key, string name, - IRoutingSinkWithSwitching display1, IRoutingSinkWithSwitching display2, + Dictionary displays, IRoutingSinkNoSwitching defaultAudio, EssentialsPresentationRoomPropertiesConfig config) : base(key, name) { Config = config; - Display1 = display1; - Display2 = display2; + Displays = displays; DefaultAudioDevice = defaultAudio; if (defaultAudio is IBasicVolumeControls) DefaultVolumeControls = defaultAudio as IBasicVolumeControls; @@ -123,6 +130,39 @@ namespace PepperDash.Essentials EnablePowerOnToLastSource = true; } + + public void DoSourceToAllDestinationsRoute(string sourceKey) + { + foreach (var display in Displays.Values) + DoVideoRoute(sourceKey, display.Key); + + } + + /// + /// Basic source -> destination routing + /// + void DoVideoRoute(string sourceKey, string destinationKey) + { + new CTimer(o => + { + var source = DeviceManager.GetDeviceForKey(sourceKey) as IRoutingSource; + if (source == null) + { + Debug.Console(1, this, "Cannot route. Source '{0}' not found", sourceKey); + return; + } + var dest = DeviceManager.GetDeviceForKey(destinationKey) as IRoutingSinkNoSwitching; + if (dest == null) + { + Debug.Console(1, this, "Cannot route. Destination '{0}' not found", destinationKey); + return; + } + + dest.ReleaseAndMakeRoute(source, eRoutingSignalType.Video); + }, 0); + } + + public void RunRouteAction(string routeKey) { RunRouteAction(routeKey, null); @@ -194,8 +234,8 @@ namespace PepperDash.Essentials if (string.IsNullOrEmpty(item.VolumeControlKey) || item.VolumeControlKey.Equals("$defaultAudio", StringComparison.OrdinalIgnoreCase)) volDev = DefaultVolumeControls; - else if (item.VolumeControlKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase)) - volDev = DefaultDisplay as IBasicVolumeControls; + //else if (item.VolumeControlKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase)) + // volDev = DefaultDisplay as IBasicVolumeControls; // Or a specific device, probably rarely used. else { @@ -242,8 +282,8 @@ namespace PepperDash.Essentials if (route.DestinationKey.Equals("$defaultaudio", StringComparison.OrdinalIgnoreCase)) dest = DefaultAudioDevice; - else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase)) - dest = DefaultDisplay; + //else if (route.DestinationKey.Equals("$defaultDisplay", StringComparison.OrdinalIgnoreCase)) + // dest = DefaultDisplay; else dest = DeviceManager.GetDeviceForKey(route.DestinationKey) as IRoutingSinkNoSwitching; @@ -271,16 +311,5 @@ namespace PepperDash.Essentials } return true; } - - /// - /// Runs "roomOff" action on all rooms not set to ExcludeFromGlobalFunctions - /// - public static void AllRoomsOff() - { - var allRooms = DeviceManager.AllDevices.Where(d => - d is EssentialsHuddleSpaceRoom && !(d as EssentialsHuddleSpaceRoom).ExcludeFromGlobalFunctions); - foreach (var room in allRooms) - (room as EssentialsHuddleSpaceRoom).RunRouteAction("roomOff"); - } } } \ No newline at end of file diff --git a/PepperDashEssentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs b/PepperDashEssentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs index cafba84f..9d49390e 100644 --- a/PepperDashEssentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs +++ b/PepperDashEssentials/PepperDashEssentials/Room/EssentialsRoomConfig.cs @@ -20,26 +20,32 @@ namespace PepperDash.Essentials public Device GetRoomObject() { var typeName = Type.ToLower(); - EssentialsHuddleSpaceRoom room = null; if (typeName == "huddle") { var props = JsonConvert.DeserializeObject (this.Properties.ToString()); var disp = DeviceManager.GetDeviceForKey(props.DefaultDisplayKey) as IRoutingSinkWithSwitching; var audio = DeviceManager.GetDeviceForKey(props.DefaultAudioKey) as IRoutingSinkNoSwitching; - room = new EssentialsHuddleSpaceRoom(Key, Name, disp, audio, props); - room.SourceListKey = props.SourceListKey; + var huddle = new EssentialsHuddleSpaceRoom(Key, Name, disp, audio, props); + huddle.SourceListKey = props.SourceListKey; + return huddle; } else if (typeName == "presentation") { var props = JsonConvert.DeserializeObject (this.Properties.ToString()); - // assign displays - - // assign audio. How?????? + var displaysDict = new Dictionary(); + uint i = 1; + foreach (var dispKey in props.DisplayKeys) // read in the ordered displays list + { + var disp = DeviceManager.GetDeviceForKey(dispKey) as IRoutingSinkWithSwitching; + displaysDict.Add(i++, disp); + } + var presRoom = new EssentialsPresentationRoom(Key, Name, displaysDict, null, props); + return presRoom; } - return room; + return null; } } diff --git a/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-10 10-07-37).log b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-10 10-07-37).log new file mode 100644 index 00000000..7ab607c6 --- /dev/null +++ b/PepperDashEssentials/PepperDashEssentials/SIMPLSharpLogs/(2017-02-10 10-07-37).log @@ -0,0 +1,31 @@ +2/10/2017 10:07:37 AM, Info: Initializing SIMPLSharp Services... +2/10/2017 10:07:37 AM, Info: ProjectInfo successfully initialized. +2/10/2017 1:58:49 PM, Info: Saving project information... +2/10/2017 1:58:49 PM, Info: Saving project information... +2/10/2017 1:58:49 PM, Info: Saving project information... +2/10/2017 2:03:49 PM, Info: Saving project information... +2/10/2017 2:03:49 PM, Info: Saving project information... +2/10/2017 2:03:49 PM, Info: Saving project information... +2/10/2017 2:08:49 PM, Info: Saving project information... +2/10/2017 2:08:49 PM, Info: Saving project information... +2/10/2017 2:08:49 PM, Info: Saving project information... +2/10/2017 2:13:49 PM, Info: Saving project information... +2/10/2017 2:13:49 PM, Info: Saving project information... +2/10/2017 2:13:49 PM, Info: Saving project information... +2/10/2017 2:18:49 PM, Info: Saving project information... +2/10/2017 2:18:49 PM, Info: Saving project information... +2/10/2017 2:18:49 PM, Info: Saving project information... +2/10/2017 2:23:49 PM, Info: Saving project information... +2/10/2017 2:23:49 PM, Info: Saving project information... +2/10/2017 2:23:49 PM, Info: Saving project information... +2/10/2017 2:28:46 PM, Info: Saving project information... +2/10/2017 2:28:46 PM, Info: Saving project information... +2/10/2017 2:28:46 PM, Info: Saving project information... +2/10/2017 2:28:46 PM, Info: Saving project information... +2/10/2017 2:28:46 PM, Info: Saving project information... +2/10/2017 2:28:46 PM, Info: Saving project information... +2/10/2017 2:29:51 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll... +2/10/2017 2:29:52 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.dll +2/10/2017 2:29:52 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\essentials\PepperDashEssentials\PepperDashEssentials\bin\PepperDashEssentials.cpz... +2/10/2017 2:29:54 PM, Info: Saving project information... +2/10/2017 2:31:19 PM, Info: Terminating SIMPLSharp Services diff --git a/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPresentationPanelAvFunctionsDriver.cs b/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPresentationPanelAvFunctionsDriver.cs index 0d2098ec..237146c0 100644 --- a/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPresentationPanelAvFunctionsDriver.cs +++ b/PepperDashEssentials/PepperDashEssentials/UI Drivers/EssentialsPresentationPanelAvFunctionsDriver.cs @@ -13,13 +13,13 @@ namespace PepperDash.Essentials /// /// /// - public class EssentialsPresentationPanelAvFunctionsDriver : PanelDriverBase + public class EssentialsPresentationPanelAvFunctionsDriver : PanelDriverBase { CrestronTouchpanelPropertiesConfig Config; public enum UiDisplayMode { - AudioSetup, AudioCallMode, PresentationMode + PresentationMode, AudioSetup } /// @@ -60,7 +60,7 @@ namespace PepperDash.Essentials set { _DefaultRoomKey = value; - CurrentRoom = DeviceManager.GetDeviceForKey(value) as EssentialsPresentationRoom; + CurrentRoom = DeviceManager.GetDeviceForKey(value) as EssentialsPresentationRoom; } } string _DefaultRoomKey; @@ -78,6 +78,12 @@ namespace PepperDash.Essentials } EssentialsPresentationRoom _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 @@ -90,8 +96,16 @@ namespace PepperDash.Essentials /// BoolFeedbackPulseExtender VolumeButtonsPopupFeedback; + /// + /// The parent driver for this + /// PanelDriverBase Parent; + /// + /// All children attached to this driver. For hiding and showing as a group. + /// + List ChildDrivers = new List(); + List CurrentDisplayModeSigsInUse = new List(); //// Important smart objects @@ -129,7 +143,8 @@ namespace PepperDash.Essentials /// /// Constructor /// - public EssentialsPresentationPanelAvFunctionsDriver(PanelDriverBase parent, CrestronTouchpanelPropertiesConfig config) + public EssentialsPresentationPanelAvFunctionsDriver(PanelDriverBase parent, + CrestronTouchpanelPropertiesConfig config) : base(parent.TriList) { Config = config; @@ -158,7 +173,6 @@ namespace PepperDash.Essentials /// public override void Show() { - // We'll want to show the current state of AV, but for now, just show rooms TriList.BooleanInput[UIBoolJoin.TopBarVisible].BoolValue = true; TriList.BooleanInput[UIBoolJoin.ActivityFooterVisible].BoolValue = true; @@ -168,6 +182,28 @@ namespace PepperDash.Essentials // Attach actions TriList.SetSigFalseAction(UIBoolJoin.VolumeButtonPopupPress, VolumeButtonsTogglePress); + //Interlocked modals + TriList.SetSigFalseAction(UIBoolJoin.InterlockedModalClosePress, HideCurrentInterlockedModal); + TriList.SetSigFalseAction(UIBoolJoin.HelpPress, () => + { + 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; + ShowInterlockedModal(UIBoolJoin.HelpPageVisible); + }); + + TriList.SetSigFalseAction(UIBoolJoin.RoomHeaderButtonPress, () => + ShowInterlockedModal(UIBoolJoin.RoomHeaderPageVisible)); + +#warning Add press and hold to gear button here + TriList.SetSigFalseAction(UIBoolJoin.GearHeaderButtonPress, () => + ShowInterlockedModal(UIBoolJoin.VolumesPageVisible)); + // power-related functions // Note: some of these are not directly-related to the huddle space UI, but are held over // in case @@ -185,11 +221,6 @@ namespace PepperDash.Essentials EssentialsHuddleSpaceRoom.AllRoomsOff(); CancelPowerOff(); }); - TriList.SetSigFalseAction(UIBoolJoin.DisplayPowerTogglePress, () => - { - if (CurrentRoom != null && CurrentRoom.DefaultDisplay is IPower) - (CurrentRoom.DefaultDisplay as IPower).PowerToggle(); - }); base.Show(); } @@ -199,6 +230,10 @@ namespace PepperDash.Essentials HideAndClearCurrentDisplayModeSigsInUse(); TriList.BooleanInput[UIBoolJoin.TopBarVisible].BoolValue = false; TriList.BooleanInput[UIBoolJoin.ActivityFooterVisible].BoolValue = false; + TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false; + TriList.BooleanInput[UIBoolJoin.TapToBeginVisible].BoolValue = false; + TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false; + TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = false; VolumeButtonsPopupFeedback.ClearNow(); CancelPowerOff(); @@ -217,8 +252,20 @@ namespace PepperDash.Essentials switch (mode) { case UiDisplayMode.PresentationMode: - CurrentDisplayModeSigsInUse.Add(TriList.BooleanInput[UIBoolJoin.StagingPageVisible]); - // Date/time + // show start page or staging... + if (CurrentRoom.OnFeedback.BoolValue) + { + TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true; + TriList.BooleanInput[UIBoolJoin.TapToBeginVisible].BoolValue = false; + TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false; + } + else + { + TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = true; + TriList.BooleanInput[UIBoolJoin.TapToBeginVisible].BoolValue = true; + TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false; + } + // Date/time if (Config.ShowDate && Config.ShowTime) { TriList.BooleanInput[UIBoolJoin.DateAndTimeVisible].BoolValue = true; @@ -243,12 +290,10 @@ namespace PepperDash.Essentials void SetupActivityFooterWhenRoomOff() { ActivityFooterSrl.Clear(); - ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(1, ActivityFooterSrl, 0, - b => { if (!b) ShowMode(UiDisplayMode.PresentationMode); })); - ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(2, ActivityFooterSrl, 0, - b => { if (!b) ShowMode(UiDisplayMode.AudioCallMode); })); - ActivityFooterSrl.Count = 2; - TriList.UShortInput[UIUshortJoin.PresentationListCaretMode].UShortValue = 1; + ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(1, ActivityFooterSrl, 0, + b => { if (!b) ShareButtonPressed(); })); + ActivityFooterSrl.Count = 1; + TriList.UShortInput[UIUshortJoin.PresentationListCaretMode].UShortValue = 0; } /// @@ -257,16 +302,52 @@ namespace PepperDash.Essentials void SetupActivityFooterWhenRoomOn() { ActivityFooterSrl.Clear(); - ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(1, ActivityFooterSrl, 0, - b => { if (!b) ShowMode(UiDisplayMode.PresentationMode); })); - ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(2, ActivityFooterSrl, 0, - b => { if (!b) ShowMode(UiDisplayMode.AudioCallMode); })); - ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(3, ActivityFooterSrl, + ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(1, ActivityFooterSrl, + 0, null)); + ActivityFooterSrl.AddItem(new SubpageReferenceListActivityItem(2, ActivityFooterSrl, 3, b => { if (!b) PowerButtonPressed(); })); - ActivityFooterSrl.Count = 3; - TriList.UShortInput[UIUshortJoin.PresentationListCaretMode].UShortValue = 2; + ActivityFooterSrl.Count = 2; + TriList.UShortInput[UIUshortJoin.PresentationListCaretMode].UShortValue = 1; + EndMeetingButtonSig = ActivityFooterSrl.BoolInputSig(2, 1); } + /// + /// Attached to activity list share button + /// + void ShareButtonPressed() + { + ShareButtonSig = ActivityFooterSrl.BoolInputSig(1, 1); + if (!_CurrentRoom.OnFeedback.BoolValue) + { + ShareButtonSig.BoolValue = true; + TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false; + TriList.BooleanInput[UIBoolJoin.StagingPageVisible].BoolValue = true; + TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = true; + } + } + + uint CurrentInterlockedModalJoin; + + void ShowInterlockedModal(uint join) + { + if (CurrentInterlockedModalJoin == join) + HideCurrentInterlockedModal(); + else + { + TriList.BooleanInput[UIBoolJoin.HelpPageVisible].BoolValue = join == UIBoolJoin.HelpPageVisible; + TriList.BooleanInput[UIBoolJoin.RoomHeaderPageVisible].BoolValue = join == UIBoolJoin.RoomHeaderPageVisible; + TriList.BooleanInput[UIBoolJoin.VolumesPageVisible].BoolValue = join == UIBoolJoin.VolumesPageVisible; + CurrentInterlockedModalJoin = join; + } + } + + void HideCurrentInterlockedModal() + { + TriList.BooleanInput[CurrentInterlockedModalJoin].BoolValue = false; + CurrentInterlockedModalJoin = 0; + } + + /// /// Shows all sigs that are in CurrentDisplayModeSigsInUse /// @@ -315,19 +396,14 @@ namespace PepperDash.Essentials void ShowCurrentSource() { if (CurrentRoom.CurrentSourceInfo == null) - { - //var offPm = new DefaultPageManager(UIBoolJoin.SelectSourcePopupVisible, TriList); - //PageManagers["OFF"] = offPm; - //CurrentSourcePageManager = offPm; - //offPm.Show(); return; - } var uiDev = CurrentRoom.CurrentSourceInfo.SourceDevice as IUiDisplayInfo; PageManager pm = null; // If we need a page manager, get an appropriate one if (uiDev != null) { + TriList.BooleanInput[UIBoolJoin.SelectASourceVisible].BoolValue = false; // Got an existing page manager, get it if (PageManagers.ContainsKey(uiDev)) pm = PageManagers[uiDev]; @@ -343,12 +419,6 @@ namespace PepperDash.Essentials CurrentSourcePageManager = pm; pm.Show(); } - else // show some default thing - { - CurrentDisplayModeSigsInUse.Add(TriList.BooleanInput[12345]); - } - - ShowCurrentDisplayModeSigsInUse(); } /// @@ -358,8 +428,7 @@ namespace PepperDash.Essentials /// The key name of the route to run void UiSelectSource(string key) { - // Run the route and when it calls back, show the source - CurrentRoom.RunRouteAction(key, null); + CurrentRoom.DoSourceToAllDestinationsRoute(key); } /// @@ -369,14 +438,23 @@ 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"); + else + ShareButtonSig.BoolValue = true; // restore Share fb + EndMeetingButtonSig.BoolValue = false; + }); } void CancelPowerOffTimer() @@ -491,12 +569,10 @@ namespace PepperDash.Essentials srcConfig.SourceKey); continue; } - //Debug.Console(0, "Adding source '{0}'", srcConfig.SourceKey); - //var s = srcConfig; // assign locals for scope in button lambda - var routeKey = kvp.Key; + var sourceKey = srcConfig.SourceKey; var item = new SubpageReferenceListSourceItem(i++, SourcesSrl, srcConfig, - b => { if (!b) UiSelectSource(routeKey); }); - SourcesSrl.AddItem(item); // add to the SRL + b => { if (!b) UiSelectSource(sourceKey); }); + SourcesSrl.AddItem(item); // add to the SRL item.RegisterForSourceChange(_CurrentRoom); } SourcesSrl.Count = (ushort)(i - 1); @@ -526,9 +602,15 @@ namespace PepperDash.Essentials var value = _CurrentRoom.OnFeedback.BoolValue; TriList.BooleanInput[UIBoolJoin.RoomIsOn].BoolValue = value; if (value) + { SetupActivityFooterWhenRoomOn(); + TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = false; + } else + { SetupActivityFooterWhenRoomOff(); + TriList.BooleanInput[UIBoolJoin.StartPageVisible].BoolValue = true; + } } /// diff --git a/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz b/PepperDashEssentials/PepperDashEssentials/bin/PepperDashEssentials.cpz index 253e30d4..eb927c37 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 00e418fe..7e566d52 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 c52e2d6f..81c3fd26 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 f0641f7c..ccf88c65 100644 --- a/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config +++ b/PepperDashEssentials/PepperDashEssentials/bin/ProgramInfo.config @@ -10,8 +10,8 @@ - 2/9/2017 2:44:02 PM - 1.0.0.26519 + 2/10/2017 2:29:52 PM + 1.0.0.26094 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 2c50ac6b..9058a56f 100644 --- a/PepperDashEssentials/PepperDashEssentials/bin/manifest.info +++ b/PepperDashEssentials/PepperDashEssentials/bin/manifest.info @@ -1,4 +1,4 @@ -MainAssembly=PepperDashEssentials.dll:7c8692784ef9f276843cfa635fe44e4b +MainAssembly=PepperDashEssentials.dll:82beec10314644945c51c91d5582e167 MainAssemblyMinFirmwareVersion=1.009.0029 MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e ü diff --git a/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser b/PepperDashEssentials/PepperDashEssentials/bin/manifest.ser index 3f03206e..91b55973 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 91e6aeea..6438f638 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 24461c7a..15085d04 100644 Binary files a/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb and b/PepperDashEssentials/PepperDashEssentials/obj/Debug/PepperDashEssentials.pdb differ