feat(essentails): #811 Adds IHasMeetingInfo, implements on ZoomRoom and updates UI drivers #812

fix(essentials): Minor fixes for MockVc to make behavior more consist…

PepperDashEssentials/UI/JoinConstants/UIBoolJoin.cs

@@ -49,6 +49,15 @@ namespace PepperDash.Essentials
 		/// 1006
 		/// </summary>
 		public const uint CallEndAllConfirmVisible = 1006;
+        /// <summary>
+        /// 1007
+        /// </summary>
+        public const uint MeetingPasswordVisible = 1007;
+        /// <summary>
+        /// 1008
+        /// </summary>
+        public const uint MeetingLeavePress = 1008;
+
 
 
 
@@ -153,6 +162,11 @@ namespace PepperDash.Essentials
         public const uint VCFavoriteVisibleStart = 1221;
         //									RANGE IN USE
         public const uint VCFavoriteVisibleEnd = 1225;
+
+        /// <summary>
+        /// 1230
+        /// </summary>
+        public const uint VCStagingMeetNowPress = 1230;
         /// <summary>
         /// 1231
         /// </summary>
@@ -844,6 +858,11 @@ namespace PepperDash.Essentials
         /// 15067
         /// </summary>
         public const uint NotificationRibbonVisible = 15067;
+        /// <summary>
+        /// 15068
+        /// </summary>
+        public const uint HeaderMeetingInfoVisible = 15068;
+
         /// <summary>
         /// 15083 - Press for Call help desk on AC/VC
         /// </summary>

PepperDashEssentials/UI/JoinConstants/UIStringlJoin.cs

@@ -27,6 +27,23 @@ namespace PepperDash.Essentials
         /// 1004
         /// </summary>
         public const uint CallSharedSourceNameText = 1004;
+        /// <summary>
+        /// 1005
+        /// </summary>
+        public const uint MeetingIdText = 1005;
+        /// <summary>
+        /// 1006
+        /// </summary>
+        public const uint MeetingHostText = 1006;
+        /// <summary>
+        /// 1007
+        /// </summary>
+        public const uint MeetingPasswordText = 1007;
+        /// <summary>
+        /// 1008
+        /// </summary>
+        public const uint MeetingNameText = 1008;
+
 
 
         /// <summary>

PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs

@@ -164,7 +164,7 @@ namespace PepperDash.Essentials
             CallCaretVisible = tempJoin + 10;
             TriList.SetSigFalseAction(tempJoin, () =>
                 {
-                    avDriver.ShowActiveCallsList();
+                    avDriver.ShowActiveCallsListOrMeetingInfo();
                     if(avDriver.CurrentRoom.InCallFeedback.BoolValue)
                         CaretInterlock.ShowInterlocked(CallCaretVisible);
                 });
@@ -256,7 +256,7 @@ namespace PepperDash.Essentials
             TriList.SetSigFalseAction(UIBoolJoin.HeaderCallStatusLabelPress,
                 () =>
                 {
-                    avDriver.ShowActiveCallsList();
+                    avDriver.ShowActiveCallsListOrMeetingInfo();
                     if (avDriver.CurrentRoom.InCallFeedback.BoolValue)
                         CaretInterlock.ShowInterlocked(CallCaretVisible);
                 });
@@ -354,6 +354,8 @@ namespace PepperDash.Essentials
                     headerPopupShown = true;
                 else if (e.NewJoin == UIBoolJoin.HeaderActiveCallsListVisible)
                     headerPopupShown = true;
+                else if (e.NewJoin == UIBoolJoin.HeaderMeetingInfoVisible)
+                    headerPopupShown = true;
                 else if (e.NewJoin == UIBoolJoin.HelpPageVisible)
                     headerPopupShown = true;
                 else if (e.NewJoin == UIBoolJoin.MeetingsOrContacMethodsListVisible)

PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
+using System.Globalization;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.UI;
@@ -13,6 +14,7 @@ using PepperDash.Essentials.Core.PageManagers;
 using PepperDash.Essentials.Room.Config;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 
 namespace PepperDash.Essentials
 {
@@ -98,6 +100,9 @@ namespace PepperDash.Essentials
 		/// </summary>
         public SubpageReferenceList MeetingOrContactMethodModalSrl { get; set; }
 
+        public uint CallListOrMeetingInfoPopoverVisibilityJoin { get; private set; }
+
+
 		/// <summary>
 		/// The list of buttons on the header. Managed with visibility only
 		/// </summary>
@@ -350,15 +355,17 @@ namespace PepperDash.Essentials
         /// <summary>
         /// Allows PopupInterlock to be toggled if the calls list is already visible, or if the codec is in a call
         /// </summary>
-        public void ShowActiveCallsList()
+        public void ShowActiveCallsListOrMeetingInfo()
         {
 			TriList.SetBool(UIBoolJoin.CallEndAllConfirmVisible, true);
-            if(PopupInterlock.CurrentJoin == UIBoolJoin.HeaderActiveCallsListVisible) 
+
-                PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
+
+            if(PopupInterlock.CurrentJoin == CallListOrMeetingInfoPopoverVisibilityJoin)
+                PopupInterlock.ShowInterlockedWithToggle(CallListOrMeetingInfoPopoverVisibilityJoin);
             else
             {
-                if((CurrentRoom.ScheduleSource as VideoCodecBase).IsInCall)
+                if(CurrentRoom.VideoCodec.IsInCall)
-                    PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
+                    PopupInterlock.ShowInterlockedWithToggle(CallListOrMeetingInfoPopoverVisibilityJoin);
             }
         }
 
@@ -470,12 +477,16 @@ namespace PepperDash.Essentials
 				Debug.Console(0, "*#* Room on: {0}, lastMeetingDismissedId: {1} {2} *#*", 
 					CurrentRoom.OnFeedback.BoolValue,
 					LastMeetingDismissedId,
-					lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToShortTimeString() : "");
+                    lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToString("t", Global.Culture) : "");
 
 				var meeting = meetings.LastOrDefault(m => m.Joinable);
 				if (CurrentRoom.OnFeedback.BoolValue
 					&& lastMeetingDismissed == meeting)
 				{
+                    // meeting no longer joinable, hide popup
+                    if(meeting == null)
+                        HideNextMeetingPopup();
+
 					return;
 				}
 
@@ -487,9 +498,11 @@ namespace PepperDash.Essentials
 				}
 				else
 				{
+
+
 					TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
-					TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToShortTimeString());
+                    TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToString("t", Global.Culture));
-					TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToShortTimeString());
+                    TriList.SetString(UIStringJoin.NextMeetingEndTimeText, meeting.EndTime.ToString("t", Global.Culture));
 					TriList.SetString(UIStringJoin.NextMeetingTitleText, meeting.Title);
 					TriList.SetString(UIStringJoin.NextMeetingNameText, meeting.Organizer);
 					TriList.SetString(UIStringJoin.NextMeetingButtonLabel, "Join");
@@ -512,7 +525,7 @@ namespace PepperDash.Essentials
 					// indexOf = 3, 4 meetings :  
 					if (indexOfNext < meetings.Count)
 						TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText,
-							meetings[indexOfNext].StartTime.ToShortTimeString());
+                            meetings[indexOfNext].StartTime.ToString("t", Global.Culture));
 					else
 						TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText, "No more meetings today");
 
@@ -941,6 +954,18 @@ namespace PepperDash.Essentials
                 _CurrentRoom.IsWarmingUpFeedback.OutputChange -= CurrentRoom_IsWarmingFeedback_OutputChange;
                 _CurrentRoom.IsCoolingDownFeedback.OutputChange -= CurrentRoom_IsCoolingDownFeedback_OutputChange;
 				_CurrentRoom.InCallFeedback.OutputChange -= CurrentRoom_InCallFeedback_OutputChange;
+
+                var scheduleAwareCodec = _CurrentRoom.VideoCodec as IHasScheduleAwareness;
+                if (scheduleAwareCodec != null)
+                {
+                    scheduleAwareCodec.CodecSchedule.MeetingsListHasChanged -= CodecSchedule_MeetingsListHasChanged;
+                }
+
+                var meetingInfoCodec = _CurrentRoom.VideoCodec as IHasMeetingInfo;
+                if (meetingInfoCodec != null)
+                {
+                    meetingInfoCodec.MeetingInfoChanged -= meetingInfoCodec_MeetingInfoChanged;
+                }
             }
 
             _CurrentRoom = room;
@@ -973,9 +998,23 @@ namespace PepperDash.Essentials
                 _CurrentRoom.CurrentSourceChange += CurrentRoom_SourceInfoChange;
                 RefreshSourceInfo();
 
-                if (_CurrentRoom.VideoCodec is IHasScheduleAwareness)
+                
+                var scheduleAwareCodec = _CurrentRoom.VideoCodec as IHasScheduleAwareness;
+                if (scheduleAwareCodec != null)
                 {
-                    (_CurrentRoom.VideoCodec as IHasScheduleAwareness).CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
+                    scheduleAwareCodec.CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
+                }
+              
+                var meetingInfoCodec = _CurrentRoom.VideoCodec as IHasMeetingInfo;
+                if (meetingInfoCodec != null)
+                {
+                    meetingInfoCodec.MeetingInfoChanged += new EventHandler<MeetingInfoEventArgs>(meetingInfoCodec_MeetingInfoChanged);
+
+                    CallListOrMeetingInfoPopoverVisibilityJoin = UIBoolJoin.HeaderMeetingInfoVisible;
+                }
+                else
+                {
+                    CallListOrMeetingInfoPopoverVisibilityJoin = UIBoolJoin.HeaderActiveCallsListVisible;
                 }
 
                 CallSharingInfoVisibleFeedback = new BoolFeedback(() => _CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue);
@@ -987,7 +1026,8 @@ namespace PepperDash.Essentials
                 if (_CurrentRoom != null)
                     _CurrentRoom.CurrentSourceChange += new SourceInfoChangeHandler(CurrentRoom_CurrentSingleSourceChange);
 
-                TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd", _CurrentRoom.SourceListKey));
+                // Moved to EssentialsVideoCodecUiDriver
+                //TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, () => _CurrentRoom.RunRouteAction("codecOsd", _CurrentRoom.SourceListKey));
 
                 (Parent as EssentialsPanelMainInterfaceDriver).HeaderDriver.SetupHeaderButtons(this, CurrentRoom);
             }
@@ -998,6 +1038,19 @@ namespace PepperDash.Essentials
             }
         }
 
+        void meetingInfoCodec_MeetingInfoChanged(object sender, MeetingInfoEventArgs e)
+        {
+            TriList.SetString(UIStringJoin.MeetingIdText, e.Info.Id);
+            TriList.SetString(UIStringJoin.MeetingHostText, e.Info.Host);
+            TriList.SetString(UIStringJoin.MeetingNameText, e.Info.Name);
+
+            TriList.SetString(UIStringJoin.MeetingPasswordText, e.Info.Password);
+            // Show the password fields if one is present
+            TriList.SetBool(UIBoolJoin.MeetingPasswordVisible, string.IsNullOrEmpty(e.Info.Password) ? false : true);
+
+            TriList.SetString(UIStringJoin.CallSharedSourceNameText, e.Info.ShareStatus);
+        }
+
         void SetCurrentRoom(IEssentialsHuddleVtc1Room room)
         {
             if (_CurrentRoom == room) return;
@@ -1209,8 +1262,8 @@ namespace PepperDash.Essentials
 			foreach (var m in CurrentRoom.ScheduleSource.CodecSchedule.Meetings)
 			{
 				i++;
-				MeetingOrContactMethodModalSrl.StringInputSig(i, 1).StringValue = m.StartTime.ToShortTimeString();
+                MeetingOrContactMethodModalSrl.StringInputSig(i, 1).StringValue = m.StartTime.ToString("t", Global.Culture);
-				MeetingOrContactMethodModalSrl.StringInputSig(i, 2).StringValue = m.EndTime.ToShortTimeString();
+                MeetingOrContactMethodModalSrl.StringInputSig(i, 2).StringValue = m.EndTime.ToString("t", Global.Culture);
 				MeetingOrContactMethodModalSrl.StringInputSig(i, 3).StringValue = m.Title;
                 MeetingOrContactMethodModalSrl.StringInputSig(i, 4).StringValue = string.Format("<br>{0}",m.Organizer);
                 MeetingOrContactMethodModalSrl.StringInputSig(i, 5).StringValue = "Join";
@@ -1507,6 +1560,8 @@ namespace PepperDash.Essentials
         /// </summary>
         void PrepareForCodecIncomingCall();
 
+        uint CallListOrMeetingInfoPopoverVisibilityJoin { get; }
+
         SubpageReferenceList MeetingOrContactMethodModalSrl { get; }
     }
 }

PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
@@ -14,6 +15,7 @@ using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.Touchpanels.Keyboards;
 using PepperDash.Essentials.Devices.Common.Codec;
 using PepperDash.Essentials.Devices.Common.VideoCodec;
+using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
 using PepperDash.Essentials.Devices.Common.Cameras;
 
 namespace PepperDash.Essentials.UIDrivers.VC
@@ -126,12 +128,6 @@ namespace PepperDash.Essentials.UIDrivers.VC
 
                 codec.CallStatusChange += new EventHandler<CodecCallStatusItemChangeEventArgs>(Codec_CallStatusChange);
 
-                // If the codec is ready, then get the values we want, otherwise wait
-                if (Codec.IsReady)
-                    Codec_IsReady();
-                else
-                    codec.IsReadyChange += (o, a) => Codec_IsReady();
-
                 //InCall = new BoolFeedback(() => false);
                 LocalPrivacyIsMuted = new BoolFeedback(() => false);
 
@@ -222,6 +218,12 @@ namespace PepperDash.Essentials.UIDrivers.VC
                     SetupPasswordPrompt();
                 }
 
+
+                // If the codec is ready, then get the values we want, otherwise wait
+                if (Codec.IsReady)
+                    Codec_IsReady();
+                else
+                    codec.IsReadyChange += (o, a) => Codec_IsReady();
             }
             catch (Exception e)
             {
@@ -421,8 +423,8 @@ namespace PepperDash.Essentials.UIDrivers.VC
                 ActiveCallsSRL.Count = (ushort)activeList.Count;
 
             // If Active Calls list is visible and codec is not in a call, hide the list    
-            if (!Codec.IsInCall && Parent.PopupInterlock.CurrentJoin == UIBoolJoin.HeaderActiveCallsListVisible)
+            if (!Codec.IsInCall && Parent.PopupInterlock.CurrentJoin == Parent.CallListOrMeetingInfoPopoverVisibilityJoin)
-                Parent.PopupInterlock.ShowInterlockedWithToggle(UIBoolJoin.HeaderActiveCallsListVisible);
+                Parent.PopupInterlock.ShowInterlockedWithToggle(Parent.CallListOrMeetingInfoPopoverVisibilityJoin);
         }
         
         /// <summary>
@@ -513,15 +515,19 @@ namespace PepperDash.Essentials.UIDrivers.VC
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingRecentsPress, ShowRecents);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingCameraPress, ShowCameraControls);
             TriList.SetSigFalseAction(UIBoolJoin.VCStagingConnectPress, ConnectPress);
+            TriList.SetSigFalseAction(UIBoolJoin.VCStagingMeetNowPress, MeetNowPress);
+            TriList.SetSigFalseAction(UIBoolJoin.CallStopSharingPress, CallStopSharingPress);
+
             TriList.SetSigFalseAction(UIBoolJoin.CallEndPress, () =>
                 {
                     if (Codec.ActiveCalls.Count > 1)
                     {
-                        Parent.PopupInterlock.ShowInterlocked(UIBoolJoin.HeaderActiveCallsListVisible);
+                        Parent.PopupInterlock.ShowInterlocked(Parent.CallListOrMeetingInfoPopoverVisibilityJoin);
                     }
                     else
                         Codec.EndAllCalls();
                 });
+
 			TriList.SetSigFalseAction(UIBoolJoin.CallEndAllConfirmPress, () =>
 				{
 					Parent.PopupInterlock.HideAndClear();
@@ -1008,7 +1014,7 @@ namespace PepperDash.Essentials.UIDrivers.VC
 					// if it's today, show a simpler string
 					string timeText = null;
 					if (c.StartTime.Date == DateTime.Now.Date)
-						timeText = c.StartTime.ToShortTimeString();
+                        timeText = c.StartTime.ToString("t", Global.Culture);
 					else if (c.StartTime == DateTime.MinValue)
 						timeText = "";
 					else
@@ -1565,6 +1571,22 @@ namespace PepperDash.Essentials.UIDrivers.VC
             StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingRecentsPress);
         }
 
+        /// <summary>
+        /// Meet Now button
+        /// </summary>
+        void MeetNowPress()
+        {
+            var startMeetingCodec = Codec as IHasStartMeeting;
+            if (startMeetingCodec != null)
+            {
+                startMeetingCodec.StartMeeting(startMeetingCodec.DefaultMeetingDurationMin);
+            }
+            else
+            {
+                Debug.Console(2, "Codce does not implment IHasStartMeeting. Cannot meet now");
+            }
+        }
+
         /// <summary>
         /// Connect call button
         /// </summary>
@@ -1575,6 +1597,16 @@ namespace PepperDash.Essentials.UIDrivers.VC
             Codec.Dial(DialStringBuilder.ToString());
         }
 
+        /// <summary>
+        /// Stop Sharing button
+        /// </summary>
+        void CallStopSharingPress()
+        {
+            Codec.StopSharing();
+            Parent.CurrentRoom.RunRouteAction("codecOsd", Parent.CurrentRoom.SourceListKey);
+        }
+
+
         /// <summary>
         /// 
         /// </summary>

essentials-framework/Essentials Core/PepperDashEssentialsBase/Global/Global.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Text.RegularExpressions;
+using System.Globalization;
 using Crestron.SimplSharp;
 using System.Collections.Generic;
 using Crestron.SimplSharp.CrestronIO;
@@ -28,6 +29,10 @@ namespace PepperDash.Essentials.Core
 
         public static eCrestronSeries ProcessorSeries { get { return CrestronEnvironment.ProgramCompatibility; } }
 
+        // TODO: consider making this configurable later
+        public static IFormatProvider Culture = CultureInfo.CreateSpecificCulture("en-US");
+
+
         /// <summary>
         /// The file path prefix to the folder containing configuration files
         /// </summary>

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz202CController.cs

@@ -1,40 +1,40 @@
-using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro;
-using System;
+using System;
-using System.Linq;
+using System.Linq;
-//using Crestron.SimplSharpPro.DeviceSupport;
+//using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
+
-using PepperDash.Core;
+using PepperDash.Core;
-using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.Bridges;
+using PepperDash.Essentials.Core.Bridges;
-
+
-namespace PepperDash.Essentials.DM
+namespace PepperDash.Essentials.DM
-{
+{
-    using eVst = eX02VideoSourceType;
+    using eVst = eX02VideoSourceType;
     using eAst = eX02AudioSourceType;
 
-    public class DmTx4kz202CController : DmTxControllerBase, ITxRoutingWithFeedback,
+    public class DmTx4kz202CController : DmTxControllerBase, ITxRoutingWithFeedback,
-        IIROutputPorts, IComPorts
+        IIROutputPorts, IComPorts
-    {
+    {
-        public DmTx4kz202C Tx { get; private set; }
+        public DmTx4kz202C Tx { get; private set; }
-
+
-        public RoutingInputPortWithVideoStatuses HdmiIn1 { get; private set; }
+        public RoutingInputPortWithVideoStatuses HdmiIn1 { get; private set; }
-        public RoutingInputPortWithVideoStatuses HdmiIn2 { get; private set; }
+        public RoutingInputPortWithVideoStatuses HdmiIn2 { get; private set; }
-        public RoutingOutputPort DmOut { get; private set; }
+        public RoutingOutputPort DmOut { get; private set; }
-        public RoutingOutputPort HdmiLoopOut { get; private set; }
+        public RoutingOutputPort HdmiLoopOut { get; private set; }
-
+
-        public override StringFeedback ActiveVideoInputFeedback { get; protected set; }
+        public override StringFeedback ActiveVideoInputFeedback { get; protected set; }
-        public IntFeedback VideoSourceNumericFeedback { get; protected set; }
+        public IntFeedback VideoSourceNumericFeedback { get; protected set; }
-        public IntFeedback AudioSourceNumericFeedback { get; protected set; }
+        public IntFeedback AudioSourceNumericFeedback { get; protected set; }
-        public IntFeedback HdmiIn1HdcpCapabilityFeedback { get; protected set; }
+        public IntFeedback HdmiIn1HdcpCapabilityFeedback { get; protected set; }
-        public IntFeedback HdmiIn2HdcpCapabilityFeedback { get; protected set; }
+        public IntFeedback HdmiIn2HdcpCapabilityFeedback { get; protected set; }
-        public BoolFeedback Hdmi1VideoSyncFeedback { get; protected set; }
+        public BoolFeedback Hdmi1VideoSyncFeedback { get; protected set; }
-        public BoolFeedback Hdmi2VideoSyncFeedback { get; protected set; }
+        public BoolFeedback Hdmi2VideoSyncFeedback { get; protected set; }
-
+
-        //public override IntFeedback HdcpSupportAllFeedback { get; protected set; }
+        //public override IntFeedback HdcpSupportAllFeedback { get; protected set; }
         //public override ushort HdcpSupportCapability { get; protected set; }
         //IroutingNumericEvent
         public event EventHandler<RoutingNumericEventArgs> NumericSwitchChange;
@@ -47,48 +47,48 @@ namespace PepperDash.Essentials.DM
         {
             var newEvent = NumericSwitchChange;
             if (newEvent != null) newEvent(this, e);
-        }
+        }
-
+
-
+
-
+
-        /// <summary>
+        /// <summary>
-        /// Helps get the "real" inputs, including when in Auto
+        /// Helps get the "real" inputs, including when in Auto
-        /// </summary>
+        /// </summary>
-        public eX02VideoSourceType ActualActiveVideoInput
+        public eX02VideoSourceType ActualActiveVideoInput
-        {
+        {
-            get
+            get
-            {
+            {
-                if (Tx.VideoSourceFeedback != eVst.Auto)
+                if (Tx.VideoSourceFeedback != eVst.Auto)
-                    return Tx.VideoSourceFeedback;
+                    return Tx.VideoSourceFeedback;
-
+
-                if (Tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
+                if (Tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
-                    return eVst.Hdmi1;
+                    return eVst.Hdmi1;
-
+
-                return Tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue ? eVst.Hdmi2 : eVst.AllDisabled;
+                return Tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue ? eVst.Hdmi2 : eVst.AllDisabled;
-            }
+            }
-        }
+        }
-        public RoutingPortCollection<RoutingInputPort> InputPorts
+        public RoutingPortCollection<RoutingInputPort> InputPorts
-        {
+        {
-            get
+            get
-            {
+            {
-                return new RoutingPortCollection<RoutingInputPort> 
+                return new RoutingPortCollection<RoutingInputPort> 
-				{ 
+				{ 
-					HdmiIn1,
+					HdmiIn1,
-					HdmiIn2,
+					HdmiIn2,
-					AnyVideoInput 
+					AnyVideoInput 
-				};
+				};
-            }
+            }
-        }
+        }
-        public RoutingPortCollection<RoutingOutputPort> OutputPorts
+        public RoutingPortCollection<RoutingOutputPort> OutputPorts
-        {
+        {
-            get
+            get
-            {
+            {
-                return new RoutingPortCollection<RoutingOutputPort> { DmOut, HdmiLoopOut };
+                return new RoutingPortCollection<RoutingOutputPort> { DmOut, HdmiLoopOut };
-            }
+            }
-        }
+        }
-        public DmTx4kz202CController(string key, string name, DmTx4kz202C tx)
+        public DmTx4kz202CController(string key, string name, DmTx4kz202C tx)
-            : base(key, name, tx)
+            : base(key, name, tx)
-        {
+        {
             Tx = tx;
 
             HdmiIn1 = new RoutingInputPortWithVideoStatuses(DmPortName.HdmiIn1,
@@ -104,208 +104,208 @@ namespace PepperDash.Essentials.DM
                 FeedbackMatchObject = eVst.Hdmi2
             };
 
-            ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
+            ActiveVideoInputFeedback = new StringFeedback("ActiveVideoInput",
-                () => ActualActiveVideoInput.ToString());
+                () => ActualActiveVideoInput.ToString());
-
+
-
+
-
+
-            Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
+            Tx.HdmiInputs[1].InputStreamChange += InputStreamChangeEvent;
-            Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
+            Tx.HdmiInputs[2].InputStreamChange += InputStreamChangeEvent;
-            Tx.BaseEvent += Tx_BaseEvent;
+            Tx.BaseEvent += Tx_BaseEvent;
-            Tx.OnlineStatusChange += Tx_OnlineStatusChange;
+            Tx.OnlineStatusChange += Tx_OnlineStatusChange;
-
+
-            VideoSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
+            VideoSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
-
+
-            //Return VideoSourceFeedback here as DM-TX-4KZ-202-C does not support audio breakaway
+            //Return VideoSourceFeedback here as DM-TX-4KZ-202-C does not support audio breakaway
-            AudioSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
+            AudioSourceNumericFeedback = new IntFeedback(() => (int)Tx.VideoSourceFeedback);
-
+
-            HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => (int)tx.HdmiInputs[1].HdcpCapabilityFeedback);
+            HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => (int)tx.HdmiInputs[1].HdcpCapabilityFeedback);
-
+
-            HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
+            HdmiIn2HdcpCapabilityFeedback = new IntFeedback("HdmiIn2HdcpCapability", () => (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
-
+
-            HdcpStateFeedback =
+            HdcpStateFeedback =
-                new IntFeedback(
+                new IntFeedback(
-                    () =>
+                    () =>
-                        tx.HdmiInputs[1].HdcpCapabilityFeedback > tx.HdmiInputs[2].HdcpCapabilityFeedback
+                        tx.HdmiInputs[1].HdcpCapabilityFeedback > tx.HdmiInputs[2].HdcpCapabilityFeedback
-                            ? (int)tx.HdmiInputs[1].HdcpCapabilityFeedback
+                            ? (int)tx.HdmiInputs[1].HdcpCapabilityFeedback
-                            : (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
+                            : (int)tx.HdmiInputs[2].HdcpCapabilityFeedback);
-
+
-            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
+            HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support;
-
+
-            Hdmi1VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue);
+            Hdmi1VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue);
-
+
-            Hdmi2VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue);
+            Hdmi2VideoSyncFeedback = new BoolFeedback(() => (bool)tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue);
-
+
-            var combinedFuncs = new VideoStatusFuncsWrapper
+            var combinedFuncs = new VideoStatusFuncsWrapper
-            {
+            {
-                HdcpActiveFeedbackFunc = () =>
+                HdcpActiveFeedbackFunc = () =>
-                    (ActualActiveVideoInput == eVst.Hdmi1
+                    (ActualActiveVideoInput == eVst.Hdmi1
-                    && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
+                    && tx.HdmiInputs[1].VideoAttributes.HdcpActiveFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.Hdmi2
+                    || (ActualActiveVideoInput == eVst.Hdmi2
-                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
+                    && tx.HdmiInputs[2].VideoAttributes.HdcpActiveFeedback.BoolValue),
-
+
-                HdcpStateFeedbackFunc = () =>
+                HdcpStateFeedbackFunc = () =>
-                {
+                {
-                    if (ActualActiveVideoInput == eVst.Hdmi1)
+                    if (ActualActiveVideoInput == eVst.Hdmi1)
-                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
+                        return tx.HdmiInputs[1].VideoAttributes.HdcpStateFeedback.ToString();
-                    if (ActualActiveVideoInput == eVst.Hdmi2)
+                    if (ActualActiveVideoInput == eVst.Hdmi2)
-                        return tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString();
+                        return tx.HdmiInputs[2].VideoAttributes.HdcpStateFeedback.ToString();
-                    return "";
+                    return "";
-                },
+                },
-
+
-                VideoResolutionFeedbackFunc = () =>
+                VideoResolutionFeedbackFunc = () =>
-                {
+                {
-                    if (ActualActiveVideoInput == eVst.Hdmi1)
+                    if (ActualActiveVideoInput == eVst.Hdmi1)
-                        return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
+                        return tx.HdmiInputs[1].VideoAttributes.GetVideoResolutionString();
-                    if (ActualActiveVideoInput == eVst.Hdmi2)
+                    if (ActualActiveVideoInput == eVst.Hdmi2)
-                        return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
+                        return tx.HdmiInputs[2].VideoAttributes.GetVideoResolutionString();
-                    return "";
+                    return "";
-                },
+                },
-                VideoSyncFeedbackFunc = () =>
+                VideoSyncFeedbackFunc = () =>
-                    (ActualActiveVideoInput == eVst.Hdmi1
+                    (ActualActiveVideoInput == eVst.Hdmi1
-                    && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
+                    && tx.HdmiInputs[1].SyncDetectedFeedback.BoolValue)
-                    || (ActualActiveVideoInput == eVst.Hdmi2
+                    || (ActualActiveVideoInput == eVst.Hdmi2
-                    && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
+                    && tx.HdmiInputs[2].SyncDetectedFeedback.BoolValue)
-
+
-            };
+            };
-
+
-            AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
+            AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn,
-                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, 0, this, combinedFuncs);
+                eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, 0, this, combinedFuncs);
-
+
-            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.DmCat, null, this);
+                eRoutingPortConnectionType.DmCat, null, this);
-            HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+            HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-                eRoutingPortConnectionType.Hdmi, null, this);
+                eRoutingPortConnectionType.Hdmi, null, this);
-
+
-
+
-            AddToFeedbackList(ActiveVideoInputFeedback, VideoSourceNumericFeedback, AudioSourceNumericFeedback,
+            AddToFeedbackList(ActiveVideoInputFeedback, VideoSourceNumericFeedback, AudioSourceNumericFeedback,
-                AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
+                AnyVideoInput.VideoStatus.HasVideoStatusFeedback, AnyVideoInput.VideoStatus.HdcpActiveFeedback,
-                AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
+                AnyVideoInput.VideoStatus.HdcpStateFeedback, AnyVideoInput.VideoStatus.VideoResolutionFeedback,
-                AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback, HdmiIn2HdcpCapabilityFeedback,
+                AnyVideoInput.VideoStatus.VideoSyncFeedback, HdmiIn1HdcpCapabilityFeedback, HdmiIn2HdcpCapabilityFeedback,
-                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback);
+                Hdmi1VideoSyncFeedback, Hdmi2VideoSyncFeedback);
-
+
-            // Set Ports for CEC
+            // Set Ports for CEC
-            HdmiIn1.Port = Tx.HdmiInputs[1];
+            HdmiIn1.Port = Tx.HdmiInputs[1];
-            HdmiIn2.Port = Tx.HdmiInputs[2];
+            HdmiIn2.Port = Tx.HdmiInputs[2];
-            HdmiLoopOut.Port = Tx.HdmiOutput;
+            HdmiLoopOut.Port = Tx.HdmiOutput;
-            DmOut.Port = Tx.DmOutput;
+            DmOut.Port = Tx.DmOutput;
-        }
+        }
-
+
-
+
-
+
-        public override bool CustomActivate()
+        public override bool CustomActivate()
-        {
+        {
-            // Link up all of these damned events to the various RoutingPorts via a helper handler
+            // Link up all of these damned events to the various RoutingPorts via a helper handler
-            Tx.HdmiInputs[1].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn1, a.EventId);
+            Tx.HdmiInputs[1].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn1, a.EventId);
-            Tx.HdmiInputs[1].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn1, a.EventId);
+            Tx.HdmiInputs[1].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn1, a.EventId);
-
+
-            Tx.HdmiInputs[2].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn2, a.EventId);
+            Tx.HdmiInputs[2].InputStreamChange += (o, a) => FowardInputStreamChange(HdmiIn2, a.EventId);
-            Tx.HdmiInputs[2].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn2, a.EventId);
+            Tx.HdmiInputs[2].VideoAttributes.AttributeChange += (o, a) => ForwardVideoAttributeChange(HdmiIn2, a.EventId);
-
+
-            // Base does register and sets up comm monitoring.
+            // Base does register and sets up comm monitoring.
-            return base.CustomActivate();
+            return base.CustomActivate();
-        }
+        }
-
+
-        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
-        {
+        {
-            var joinMap = GetDmTxJoinMap(joinStart, joinMapKey);
+            var joinMap = GetDmTxJoinMap(joinStart, joinMapKey);
-
+
-            if (Hdmi1VideoSyncFeedback != null)
+            if (Hdmi1VideoSyncFeedback != null)
-            {
+            {
-                Hdmi1VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input1VideoSyncStatus.JoinNumber]);
+                Hdmi1VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input1VideoSyncStatus.JoinNumber]);
-            }
+            }
-            if (Hdmi2VideoSyncFeedback != null)
+            if (Hdmi2VideoSyncFeedback != null)
-            {
+            {
-                Hdmi2VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input2VideoSyncStatus.JoinNumber]);
+                Hdmi2VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.Input2VideoSyncStatus.JoinNumber]);
-            }
+            }
-
+
-            LinkDmTxToApi(this, trilist, joinMap, bridge);
+            LinkDmTxToApi(this, trilist, joinMap, bridge);
-        }
+        }
-
+
-        public void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type)
+        public void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type)
-        {
+        {
-            Debug.Console(2, this, "Executing Numeric Switch to input {0}.", input);
+            Debug.Console(2, this, "Executing Numeric Switch to input {0}.", input);
-
+
-            switch (type)
+            switch (type)
-            {
+            {
-                case eRoutingSignalType.Video:
+                case eRoutingSignalType.Video:
-                    switch (input)
+                    switch (input)
-                    {
+                    {
-                        case 0:
+                        case 0:
-                        {
+                        {
-                            ExecuteSwitch(eVst.Auto, null, type);
+                            ExecuteSwitch(eVst.Auto, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 1:
+                        case 1:
-                        {
+                        {
-                            ExecuteSwitch(HdmiIn1.Selector, null, type);
+                            ExecuteSwitch(HdmiIn1.Selector, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 2:
+                        case 2:
-                        {
+                        {
-                            ExecuteSwitch(HdmiIn2.Selector, null, type);
+                            ExecuteSwitch(HdmiIn2.Selector, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 3:
+                        case 3:
-                        {
+                        {
-                            ExecuteSwitch(eVst.AllDisabled, null, type);
+                            ExecuteSwitch(eVst.AllDisabled, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                    }
+                    }
-                    break;
+                    break;
-                case eRoutingSignalType.Audio:
+                case eRoutingSignalType.Audio:
-                    switch (input)
+                    switch (input)
-                    {
+                    {
-                        case 0:
+                        case 0:
-                        {
+                        {
-                            ExecuteSwitch(eAst.Auto, null, type);
+                            ExecuteSwitch(eAst.Auto, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 1:
+                        case 1:
-                        {
+                        {
-                            ExecuteSwitch(eAst.Hdmi1, null, type);
+                            ExecuteSwitch(eAst.Hdmi1, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 2:
+                        case 2:
-                        {
+                        {
-                            ExecuteSwitch(eAst.Hdmi2, null, type);
+                            ExecuteSwitch(eAst.Hdmi2, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                        case 3:
+                        case 3:
-                        {
+                        {
-                            ExecuteSwitch(eAst.AllDisabled, null, type);
+                            ExecuteSwitch(eAst.AllDisabled, null, type);
-                            break;
+                            break;
-                        }
+                        }
-                    }
+                    }
-                    break;
+                    break;
-            }
+            }
-        }
+        }
-
+
-        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
+        public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
-        {
+        {
-            if ((signalType & eRoutingSignalType.Video) == eRoutingSignalType.Video)
+            if ((signalType & eRoutingSignalType.Video) == eRoutingSignalType.Video)
-                Tx.VideoSource = (eVst)inputSelector;
+                Tx.VideoSource = (eVst)inputSelector;
-            if(((signalType & eRoutingSignalType.Audio) == eRoutingSignalType.Audio))
+            if(((signalType & eRoutingSignalType.Audio) == eRoutingSignalType.Audio))
-                Debug.Console(2, this, "Unable to execute audio-only switch for tx {0}", Key);
+                Debug.Console(2, this, "Unable to execute audio-only switch for tx {0}", Key);
-        }
+        }
-
+
-        void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
+        void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)
-        {
+        {
-            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
+            Debug.Console(2, "{0} event {1} stream {2}", Tx.ToString(), inputStream.ToString(), args.EventId.ToString());
-
+
-            switch (args.EventId)
+            switch (args.EventId)
-            {
+            {
-                case EndpointInputStreamEventIds.HdcpSupportOffFeedbackEventId:
+                case EndpointInputStreamEventIds.HdcpSupportOffFeedbackEventId:
-                case EndpointInputStreamEventIds.HdcpSupportOnFeedbackEventId:
+                case EndpointInputStreamEventIds.HdcpSupportOnFeedbackEventId:
-                case EndpointInputStreamEventIds.HdcpCapabilityFeedbackEventId:
+                case EndpointInputStreamEventIds.HdcpCapabilityFeedbackEventId:
-                    if (inputStream == Tx.HdmiInputs[1]) HdmiIn1HdcpCapabilityFeedback.FireUpdate();
+                    if (inputStream == Tx.HdmiInputs[1]) HdmiIn1HdcpCapabilityFeedback.FireUpdate();
-                    if (inputStream == Tx.HdmiInputs[2]) HdmiIn2HdcpCapabilityFeedback.FireUpdate();
+                    if (inputStream == Tx.HdmiInputs[2]) HdmiIn2HdcpCapabilityFeedback.FireUpdate();
-                    break;
+                    break;
-                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
+                case EndpointInputStreamEventIds.SyncDetectedFeedbackEventId:
-                    if (inputStream == Tx.HdmiInputs[1]) Hdmi1VideoSyncFeedback.FireUpdate();
+                    if (inputStream == Tx.HdmiInputs[1]) Hdmi1VideoSyncFeedback.FireUpdate();
-                    if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
+                    if (inputStream == Tx.HdmiInputs[2]) Hdmi2VideoSyncFeedback.FireUpdate();
-                    break;
+                    break;
-            }
+            }
         }
 
         void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
@@ -313,7 +313,7 @@ namespace PepperDash.Essentials.DM
             var localVideoInputPort =
                 InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
             var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
+                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
 
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
@@ -338,68 +338,68 @@ namespace PepperDash.Essentials.DM
                     OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
+                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
+                    Debug.Console(2, this, "  Audio Source: {0}", Tx.VideoSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
                     OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;
             }
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// Relays the input stream change to the appropriate RoutingInputPort.
+        /// Relays the input stream change to the appropriate RoutingInputPort.
-        /// </summary>
+        /// </summary>
-        void FowardInputStreamChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
+        void FowardInputStreamChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-        {
+        {
-            if (eventId != EndpointInputStreamEventIds.SyncDetectedFeedbackEventId)
+            if (eventId != EndpointInputStreamEventIds.SyncDetectedFeedbackEventId)
-            {
+            {
-                return;
+                return;
-            }
+            }
-            inputPort.VideoStatus.VideoSyncFeedback.FireUpdate();
+            inputPort.VideoStatus.VideoSyncFeedback.FireUpdate();
-            AnyVideoInput.VideoStatus.VideoSyncFeedback.FireUpdate();
+            AnyVideoInput.VideoStatus.VideoSyncFeedback.FireUpdate();
-        }
+        }
-
+
-        /// <summary>
+        /// <summary>
-        /// Relays the VideoAttributes change to a RoutingInputPort
+        /// Relays the VideoAttributes change to a RoutingInputPort
-        /// </summary>
+        /// </summary>
-        void ForwardVideoAttributeChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
+        void ForwardVideoAttributeChange(RoutingInputPortWithVideoStatuses inputPort, int eventId)
-        {
+        {
-            //// LOCATION: Crestron.SimplSharpPro.DM.VideoAttributeEventIds
+            //// LOCATION: Crestron.SimplSharpPro.DM.VideoAttributeEventIds
-            //Debug.Console(2, this, "VideoAttributes_AttributeChange event id={0} from {1}",
+            //Debug.Console(2, this, "VideoAttributes_AttributeChange event id={0} from {1}",
-            //    args.EventId, (sender as VideoAttributesEnhanced).Owner.GetType());
+            //    args.EventId, (sender as VideoAttributesEnhanced).Owner.GetType());
-            switch (eventId)
+            switch (eventId)
-            {
+            {
-                case VideoAttributeEventIds.HdcpActiveFeedbackEventId:
+                case VideoAttributeEventIds.HdcpActiveFeedbackEventId:
-                    inputPort.VideoStatus.HdcpActiveFeedback.FireUpdate();
+                    inputPort.VideoStatus.HdcpActiveFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.HdcpActiveFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.HdcpActiveFeedback.FireUpdate();
-                    break;
+                    break;
-                case VideoAttributeEventIds.HdcpStateFeedbackEventId:
+                case VideoAttributeEventIds.HdcpStateFeedbackEventId:
-                    inputPort.VideoStatus.HdcpStateFeedback.FireUpdate();
+                    inputPort.VideoStatus.HdcpStateFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.HdcpStateFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.HdcpStateFeedback.FireUpdate();
-                    break;
+                    break;
-                case VideoAttributeEventIds.HorizontalResolutionFeedbackEventId:
+                case VideoAttributeEventIds.HorizontalResolutionFeedbackEventId:
-                case VideoAttributeEventIds.VerticalResolutionFeedbackEventId:
+                case VideoAttributeEventIds.VerticalResolutionFeedbackEventId:
-                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    break;
+                    break;
-                case VideoAttributeEventIds.FramesPerSecondFeedbackEventId:
+                case VideoAttributeEventIds.FramesPerSecondFeedbackEventId:
-                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                    AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate();
-                    break;
+                    break;
-            }
+            }
-        }
+        }
-
+
-
+
-
+
-
+
-        #region IIROutputPorts Members
+        #region IIROutputPorts Members
-        public CrestronCollection<IROutputPort> IROutputPorts { get { return Tx.IROutputPorts; } }
+        public CrestronCollection<IROutputPort> IROutputPorts { get { return Tx.IROutputPorts; } }
-        public int NumberOfIROutputPorts { get { return Tx.NumberOfIROutputPorts; } }
+        public int NumberOfIROutputPorts { get { return Tx.NumberOfIROutputPorts; } }
-        #endregion
+        #endregion
-
+
-        #region IComPorts Members
+        #region IComPorts Members
-        public CrestronCollection<ComPort> ComPorts { get { return Tx.ComPorts; } }
+        public CrestronCollection<ComPort> ComPorts { get { return Tx.ComPorts; } }
-        public int NumberOfComPorts { get { return Tx.NumberOfComPorts; } }
+        public int NumberOfComPorts { get { return Tx.NumberOfComPorts; } }
-        #endregion
+        #endregion
-    }
+    }
 }

essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs

@@ -339,7 +339,7 @@ namespace PepperDash.Essentials.DM
             var localVideoInputPort =
                 InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
             var localAudioInputPort =
-                InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
+                InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
 
             ActiveVideoInputFeedback.FireUpdate();
             VideoSourceNumericFeedback.FireUpdate();
@@ -364,8 +364,8 @@ namespace PepperDash.Essentials.DM
                     OnSwitchChange(new RoutingNumericEventArgs(1, VideoSourceNumericFeedback.UShortValue, OutputPorts.First(), localVideoInputPort, eRoutingSignalType.Video));
                     break;
                 case EndpointTransmitterBase.AudioSourceFeedbackEventId:
-                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eAst)p.Selector == Tx.AudioSourceFeedback);
+                    var localInputAudioPort = InputPorts.FirstOrDefault(p => (eVst)p.Selector == Tx.VideoSourceFeedback);
-                    Debug.Console(2, this, "  Audio Source: {0}", Tx.AudioSourceFeedback);
+                    Debug.Console(2, this, "  Audio Source: {0}", Tx.VideoSourceFeedback);
                     AudioSourceNumericFeedback.FireUpdate();
                     OnSwitchChange(new RoutingNumericEventArgs(1, AudioSourceNumericFeedback.UShortValue, OutputPorts.First(), localInputAudioPort, eRoutingSignalType.Audio));
                     break;

essentials-framework/Essentials Devices Common/Essentials Devices Common/Codec/iHasDirectory.cs

@@ -160,7 +160,19 @@ namespace PepperDash.Essentials.Devices.Common.Codec
     /// </summary>
     public interface IInvitableContact
     {
+        bool IsInvitableContact { get; }
+    }
 
+    public class InvitableDirectoryContact : DirectoryContact, IInvitableContact
+    {
+        [JsonProperty("isInvitableContact")]
+        public bool IsInvitableContact
+        {
+            get
+            {
+                return this is IInvitableContact;
+            }
+        }
     }
 
 	/// <summary>
@@ -209,15 +221,6 @@ namespace PepperDash.Essentials.Devices.Common.Codec
 		[JsonProperty("title")]
         public string Title { get; set; }
 
-        [JsonProperty("isInvitableContact")]
-        public bool IsInvitableContact
-        {
-            get 
-            {
-                return this is IInvitableContact;
-            }
-        }
-
 		[JsonProperty("contactMethods")]
         public List<ContactMethod> ContactMethods { get; set; }
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -120,9 +120,11 @@
     <Compile Include="VideoCodec\CiscoCodec\RoomPresets.cs" />
     <Compile Include="Cameras\CameraControl.cs" />
     <Compile Include="Display\PanasonicThDisplay.cs" />
+    <Compile Include="VideoCodec\Interfaces\IHasMeetingInfo.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasParticipants.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasSelfviewPosition.cs" />
     <Compile Include="VideoCodec\Interfaces\IHasSelfviewSize.cs" />
+    <Compile Include="VideoCodec\Interfaces\IHasStartMeeting.cs" />
     <Compile Include="VideoCodec\Interfaces\iVideoCodecInfo.cs" />
     <Compile Include="Codec\iHasCallFavorites.cs" />
     <Compile Include="Codec\iHasCallHistory.cs" />

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs

@@ -736,6 +736,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 
         }
 
+        /// <summary>
+        /// Appends the delimiter and send the command to the codec
+        /// </summary>
+        /// <param name="command"></param>
         public void SendText(string command)
         {
             if (CommDebuggingIsOn)

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasMeetingInfo.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
+{
+    /// <summary>
+    /// Describes a device that provides meeting information (like a ZoomRoom)
+    /// </summary>
+    public interface IHasMeetingInfo
+    {
+        event EventHandler<MeetingInfoEventArgs> MeetingInfoChanged;
+
+        MeetingInfo MeetingInfo { get; }
+    }
+
+    /// <summary>
+    /// Represents the information about a meeting in progress
+    /// Currently used for Zoom meetings
+    /// </summary>
+    public class MeetingInfo
+    {
+        public string Id { get; private set; }
+        public string Name { get; private set; }
+        public string Host { get; set; }
+        public string Password { get; private set; }
+        public string ShareStatus { get; private set; }
+
+        public MeetingInfo(string id, string name, string host, string password, string shareStatus)
+        {
+            Id = id;
+            Name = name;
+            Host = host;
+            Password = password;
+            ShareStatus = shareStatus;
+        }
+    }
+
+    public class MeetingInfoEventArgs : EventArgs
+    {
+        public MeetingInfo Info { get; private set; }
+
+        public MeetingInfoEventArgs(MeetingInfo info)
+        {
+            Info = info;
+        }
+
+    }
+}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasParticipants.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -60,6 +61,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
 			}
 		}
 
+        public Participant Host
+        {
+            get
+            {
+                return _currentParticipants.FirstOrDefault(p => p.IsHost);
+            }
+        }
+
 		public event EventHandler<EventArgs> ParticipantsListHasChanged;
 
 		public CodecParticipants()

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasStartMeeting.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
+{
+    /// <summary>
+    /// Describes the ability to start an ad-hoc meeting
+    /// </summary>
+    public interface IHasStartMeeting
+    {
+        /// <summary>
+        /// The default meeting duration in minutes
+        /// </summary>
+        uint DefaultMeetingDurationMin { get; }
+
+        /// <summary>
+        /// Start an ad-hoc meeting for the specified duration
+        /// </summary>
+        /// <param name="duration"></param>
+        void StartMeeting(uint duration);
+
+        /// <summary>
+        /// Leaves a meeting without ending it
+        /// </summary>
+        void LeaveMeeting();
+    }
+}

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs

@@ -78,6 +78,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
             SetupCameras();
 
+            CreateOsdSource();
+
             SetIsReady();
        }
 
@@ -117,6 +119,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         }
         bool _StandbyIsOn;
 
+        /// <summary>
+        /// Creates the fake OSD source, and connects it's AudioVideo output to the CodecOsdIn input
+        /// to enable routing 
+        /// </summary>
+        private void CreateOsdSource()
+        {
+            OsdSource = new DummyRoutingInputsDevice(Key + "[osd]");
+            DeviceManager.AddDevice(OsdSource);
+            var tl = new TieLine(OsdSource.AudioVideoOutputPort, CodecOsdIn);
+            TieLineCollection.Default.Add(tl);
+
+            //foreach(var input in Status.Video.
+        }
 
         /// <summary>
         /// Dials, yo!
@@ -567,6 +582,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         void SetupCameras()
         {
+            SupportsCameraAutoMode = true;
+
+            SupportsCameraOff = false;
+
             Cameras = new List<CameraBase>();
 
             var internalCamera = new MockVCCamera(Key + "-camera1", "Near End", this);

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs

@@ -836,10 +836,10 @@ ScreenIndexIsPinnedTo: {8} (a{17})
 				//serials
 				tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, meeting.Organizer);
 				tokenArray[stringIndex + 1] = new XSigSerialToken(stringIndex + 2, meeting.Title);
-				tokenArray[stringIndex + 2] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToShortDateString());
+                tokenArray[stringIndex + 2] = new XSigSerialToken(stringIndex + 3, meeting.StartTime.ToString("t", Global.Culture));
-				tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 4, meeting.StartTime.ToShortTimeString());
+				tokenArray[stringIndex + 3] = new XSigSerialToken(stringIndex + 4, meeting.StartTime.ToString("t", Global.Culture));
-				tokenArray[stringIndex + 4] = new XSigSerialToken(stringIndex + 5, meeting.EndTime.ToShortDateString());
+                tokenArray[stringIndex + 4] = new XSigSerialToken(stringIndex + 5, meeting.EndTime.ToString("t", Global.Culture));
-				tokenArray[stringIndex + 5] = new XSigSerialToken(stringIndex + 6, meeting.EndTime.ToShortTimeString());
+				tokenArray[stringIndex + 5] = new XSigSerialToken(stringIndex + 6, meeting.EndTime.ToString("t", Global.Culture));
 				tokenArray[stringIndex + 6] = new XSigSerialToken(stringIndex + 7, meeting.Id);
 
 

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs

@@ -236,14 +236,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
-		/// <summary>
-		/// Used to be able to inplement IInvitableContact on DirectoryContact
-		/// </summary>
-		public class ZoomDirectoryContact : DirectoryContact, IInvitableContact
-		{
-
-		}
-
 		public class Phonebook
 		{
 			[JsonProperty("Contacts")]
@@ -302,7 +294,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					
 					foreach (Contact c in zoomContacts)
 					{
-						var contact = new ZoomDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
+						var contact = new InvitableDirectoryContact { Name = c.ScreenName, ContactId = c.Jid };
 
                         contact.ContactMethods.Add(new ContactMethod() { Number = c.Jid, Device = eContactMethodDevice.Video, CallType = eContactMethodCallType.Video, ContactMethodId = c.Jid });
 
@@ -439,6 +431,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		{
 			private string _dispState;
 			private string _password;
+            private bool _isAirHostClientConnected;
+            private bool _isSharingBlackMagic;
+            private bool _isDirectPresentationConnected;
+
 
 			public string directPresentationPairingCode { get; set; }
 			/// <summary>
@@ -460,11 +456,51 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					}
 				}
 			}
-			public bool isAirHostClientConnected { get; set; }
+
+			public bool isAirHostClientConnected 
+            {
+                get { return _isAirHostClientConnected; }
+                set
+                {
+                    if (value != _isAirHostClientConnected)
+                    {
+                        _isAirHostClientConnected = value;
+                        NotifyPropertyChanged("isAirHostClientConnected");
+                    }
+                }
+            }
+
 			public bool isBlackMagicConnected { get; set; }
 			public bool isBlackMagicDataAvailable { get; set; }
-			public bool isDirectPresentationConnected { get; set; }
+
-			public bool isSharingBlackMagic { get; set; }
+			public bool isDirectPresentationConnected
+            {
+                get { return _isDirectPresentationConnected; }
+                set
+                {
+                    if (value != _isDirectPresentationConnected)
+                    {
+                        _isDirectPresentationConnected = value;
+                        NotifyPropertyChanged("isDirectPresentationConnected");
+                    }
+                }
+            }
+
+			public bool isSharingBlackMagic
+            {
+                get { return _isSharingBlackMagic; }
+                set
+                {
+                    if (value != _isSharingBlackMagic)
+                    {
+                        _isSharingBlackMagic = value;
+                        NotifyPropertyChanged("isSharingBlackMagic");
+                    }
+                }
+            }
+
+
+
 			/// <summary>
 			/// IOS Airplay code
 			/// </summary>
@@ -787,7 +823,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			private bool _paused;
 			private eSharingState _state;
 
-			public bool IsSharing;
+            public bool IsSharing { get; private set; }
 
 			[JsonProperty("paused")]
 			public bool Paused

essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs

@@ -25,10 +25,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		IRouting,
 		IHasScheduleAwareness, IHasCodecCameras, IHasParticipants, IHasCameraOff, IHasCameraMute, IHasCameraAutoMode,
 		IHasFarEndContentStatus, IHasSelfviewPosition, IHasPhoneDialing, IHasZoomRoomLayouts, IHasParticipantPinUnpin,
-		IHasParticipantAudioMute, IHasSelfviewSize, IPasswordPrompt
+		IHasParticipantAudioMute, IHasSelfviewSize, IPasswordPrompt, IHasStartMeeting, IHasMeetingInfo
 	{
 		private const long MeetingRefreshTimer = 60000;
-		private const uint DefaultMeetingDurationMin = 30;
+        public uint DefaultMeetingDurationMin { get; private set; }
+
 		private const string Delimiter = "\x0D\x0A";
 
 		private readonly GenericQueue _receiveQueue;
@@ -52,6 +53,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		public ZoomRoom(DeviceConfig config, IBasicCommunication comm)
 			: base(config)
 		{
+            DefaultMeetingDurationMin = 30;
+
 			_props = JsonConvert.DeserializeObject<ZoomRoomPropertiesConfig>(config.Properties.ToString());
 
 			_receiveQueue = new GenericQueue(Key + "-rxQueue", Thread.eThreadPriority.MediumPriority, 512);
@@ -467,6 +470,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				{
 					SharingContentIsOnFeedback.FireUpdate();
 					ReceivingContent.FireUpdate();
+
+                    // Update the share status of the meeting info
+                    var meetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, Participants.Host.Name, MeetingInfo.Password, GetSharingStatus());
+                    MeetingInfo = meetingInfo;
 				}
 			};
 
@@ -615,6 +622,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 						break;
 					case "password":
 						break;
+                    case "isAirHostClientConnected":
+                    case "isDirectPresentationConnected":
+                    case "isSharingBlackMagic":
+                        {
+                            // Update the share status of the meeting info
+                            var meetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, MeetingInfo.Host, MeetingInfo.Password, GetSharingStatus());
+                            MeetingInfo = meetingInfo;
+                            break;
+                        }
 				}
 			};
 
@@ -731,7 +747,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				ConsoleAccessLevelEnum.AccessOperator);
 			if (!_props.DisablePhonebookAutoDownload)
 			{
-				CrestronConsole.AddNewConsoleCommand(s => SendText("zCommand Phonebook List Offset: 0 Limit: 512"),
+				CrestronConsole.AddNewConsoleCommand(s => SendText("zCommand Phonebook List Offset: 0 Limit: 10000"),
 					"GetZoomRoomContacts", "Triggers a refresh of the codec phonebook",
 					ConsoleAccessLevelEnum.AccessOperator);
 			}
@@ -954,9 +970,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					{
 						_syncState.LoginMessageReceived();
 
+
 						// Fire up a thread to send the intial commands.
 						CrestronInvoke.BeginInvoke(o =>
 						{
+                            // Currently the feedback exclusions don't work when using the API in JSON response mode
+                            // But leave these here in case the API gets updated in the future 
+
+
 							Thread.Sleep(100);
 							// disable echo of commands
 							SendText("echo off");
@@ -1176,6 +1197,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 										Status.Call.Participants);
 
 								Participants.CurrentParticipants = participants;
+
+                                // Update the share status of the meeting info
+                                var meetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, Participants.Host.Name, MeetingInfo.Password, MeetingInfo.ShareStatus);
+                                MeetingInfo = meetingInfo;
+
 								PrintCurrentCallParticipants();
 
 								break;
@@ -1639,7 +1665,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 				// If not crrently in a meeting, intialize the call object
 				if (callStatus != zStatus.eCallStatus.IN_MEETING && callStatus != zStatus.eCallStatus.CONNECTING_MEETING)
 				{
-					Debug.Console(1, this, "[UpdateCallStatus] Creating new Status.Call object");
+                    //Debug.Console(1, this, "[UpdateCallStatus] Creating new Status.Call object");
 					Status.Call = new zStatus.Call {Status = callStatus};
 
 					OnCallStatusChange(new CodecActiveCallItem() {Status = eCodecCallStatus.Disconnected});
@@ -1677,15 +1703,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 
 							ActiveCalls.Add(newCall);
 
-							Debug.Console(1, this, "[UpdateCallStatus] IF w/ meeting_id AcitveCalls.Count == {1} - Current Call Status: {0}",
+                            //Debug.Console(1, this, "[UpdateCallStatus] IF w/ meeting_id AcitveCalls.Count == {1} - Current Call Status: {0}",
-								Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
+                                //Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
 
 							OnCallStatusChange(newCall);
 						}
 						else
 						{
-							Debug.Console(1, this, "[UpdateCallStatus] IF w/o meeting_id AcitveCalls.Count == {1} - Current Call Status: {0}",
+                            //Debug.Console(1, this, "[UpdateCallStatus] IF w/o meeting_id AcitveCalls.Count == {1} - Current Call Status: {0}",
-								Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
+                                //Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
 						}
 					}
 				}
@@ -1745,6 +1771,23 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		{
 			base.OnCallStatusChange(item);
 
+            if (item.Status == eCodecCallStatus.Connected)
+            {
+
+                var host = "";
+
+                if (Participants.Host != null)
+                    host = Participants.Host.Name;
+
+                MeetingInfo = new MeetingInfo(
+                    Status.Call.Info.meeting_id,
+                    Status.Call.Info.meeting_list_item.meetingName,
+                    host,
+                    Status.Call.Info.meeting_password,
+                    GetSharingStatus()
+                    );
+            }
+
 			Debug.Console(1, this, "[OnCallStatusChange] Current Call Status: {0}",
 				Status.Call != null ? Status.Call.Status.ToString() : "no call");
 
@@ -1754,6 +1797,30 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
+        private string GetSharingStatus()
+        {
+            string sharingState = "None";
+
+            if (Status.Call.Sharing.State == zEvent.eSharingState.Receiving)
+            {
+                sharingState = "Receiving Content";
+            }
+            if (Status.Sharing.isAirHostClientConnected)
+            {
+                sharingState = "Sharing AirPlay";
+            }
+            if (Status.Sharing.isDirectPresentationConnected)
+            {
+                sharingState = "Sharing Laptop";
+            }
+            if (Status.Sharing.isSharingBlackMagic)
+            {
+                sharingState = "Sharing HDMI Source";
+            }
+
+            return sharingState;
+        }
+
 		public override void StartSharing()
 		{
 			SendText("zCommand Call Sharing HDMI Start");
@@ -2077,7 +2144,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		/// <param name="contact"></param>
 		public override void Dial(IInvitableContact contact)
 		{
-			var ic = contact as zStatus.ZoomDirectoryContact;
+            var ic = contact as InvitableDirectoryContact;
 
 			if (ic != null)
 			{
@@ -2095,6 +2162,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			}
 		}
 
+
+        /// <summary>
+        /// Starts a PMI Meeting for the specified duration (or default meeting duration if 0 is specified)
+        /// </summary>
+        /// <param name="duration">duration of meeting</param>
+        public void StartMeeting(uint duration)
+        {
+            uint dur = DefaultMeetingDurationMin;
+
+            if (duration > 0)
+                dur = duration;
+
+            SendText(string.Format("zCommand Dial StartPmi Duration: {0}", dur));
+        }
+
+        public void LeaveMeeting()
+        {
+            SendText("zCommand Call Leave");
+        }
+
 		public override void EndCall(CodecActiveCallItem call)
 		{
 			SendText("zCommand Call Disconnect");
@@ -2719,6 +2806,32 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
         }
 
         #endregion
+
+        #region IHasMeetingInfo Members
+
+        public event EventHandler<MeetingInfoEventArgs> MeetingInfoChanged;
+
+        private MeetingInfo _meetingInfo;
+
+        public MeetingInfo MeetingInfo
+        {
+            get { return _meetingInfo; }
+            private set
+            {
+                if (value != _meetingInfo)
+                {
+                    _meetingInfo = value;
+
+                    var handler = MeetingInfoChanged;
+                    if (handler != null)
+                    {
+                        handler(this, new MeetingInfoEventArgs(_meetingInfo));
+                    }
+                }
+            }
+        }
+
+        #endregion
     }
 
 	/// <summary>