Merge branch 'main' into hotfix/dm-resolution-issues

fix(DM): Fix issue with bad cast for IVideoAttributesBasic
Also updates to use the DM routing input port rather than the tx AnyVideoInput for the DM input resolutions
2026-02-12 11:15:08 +00:00 · 2021-09-21 10:17:26 -06:00 · 2021-09-21 09:40:51 -06:00 · 2021-09-20 16:12:39 -06:00 · 2021-09-20 14:24:11 -06:00 · 2021-09-20 13:28:54 -06:00
11 changed files with 511 additions and 204 deletions
--- a/.github/scripts/ZipBuildOutput.ps1
+++ b/.github/scripts/ZipBuildOutput.ps1
@@ -8,6 +8,7 @@ $destination = "$($Env:GITHUB_HOME)\output"
 New-Item -ItemType Directory -Force -Path ($destination)
 Get-ChildItem ($destination)
 $exclusions = @(git submodule foreach --quiet 'echo $name')
+$exclusions += "Newtonsoft.Compact.Json.dll"
 # Trying to get any .json schema files (not currently working)
 # Gets any files with the listed extensions.
 Get-ChildItem -recurse -Path "$($Env:GITHUB_WORKSPACE)" -include "*.clz", "*.cpz", "*.cplz", "*.dll", "*.nuspec" | ForEach-Object {
--- a/PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs
+++ b/PepperDashEssentials/UIDrivers/Essentials/EssentialsHeaderDriver.cs
@@ -195,22 +195,11 @@ namespace PepperDash.Essentials
            var meetingInfoCodec = codec as IHasMeetingInfo;

            // Set mode of header button
-            if (!codec.IsInCall)
-            {
-                HeaderCallButtonIconSig.StringValue = "DND";
-                //HeaderCallButton.SetIcon(HeaderListButton.OnHook);
-            }
-            else if (codec.ActiveCalls.Any(c => c.Type == eCodecCallType.Video))
-                HeaderCallButtonIconSig.StringValue = "Misc-06_Dark";
-            //HeaderCallButton.SetIcon(HeaderListButton.Camera);
-            //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 2);
-            else
-                HeaderCallButtonIconSig.StringValue = "Misc-09_Dark";
-            //HeaderCallButton.SetIcon(HeaderListButton.Phone);
-            //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 1);
+            SetHeaderCallIcon(codec);

            // Set the call status text
            Debug.Console(1, "Active Call Count: {0}", codec.ActiveCalls.Count);
+
            if (codec.ActiveCalls.Count > 0)
            {
                if (codec.ActiveCalls.Count == 1 && meetingInfoCodec == null)
@@ -218,8 +207,13 @@ namespace PepperDash.Essentials
                else if (codec.ActiveCalls.Count == 1 && meetingInfoCodec != null)
                {
                    var headerCallStatusLabel = meetingInfoCodec.MeetingInfo.IsSharingMeeting
-                        ? "Sharing Active"
+                        ? "Sharing-Only Meeting"
                        : "Active Meeting";
+
+                    headerCallStatusLabel = meetingInfoCodec.MeetingInfo.WaitingForHost
+                        ? "Waiting For Host"
+                        : headerCallStatusLabel;
+
                    TriList.SetString(UIStringJoin.HeaderCallStatusLabel, headerCallStatusLabel);
                }
                else if (codec.ActiveCalls.Count > 1)
@@ -229,6 +223,27 @@ namespace PepperDash.Essentials
                TriList.SetString(UIStringJoin.HeaderCallStatusLabel, "No Active Calls");
        }

+        private void SetHeaderCallIcon(VideoCodecBase codec)
+        {
+            if (!codec.IsInCall)
+            {
+                HeaderCallButtonIconSig.StringValue = "DND";
+                //HeaderCallButton.SetIcon(HeaderListButton.OnHook);
+            }
+            else if (codec.ActiveCalls.Any(c => c.Type == eCodecCallType.Video))
+            {
+                HeaderCallButtonIconSig.StringValue = "Misc-06_Dark";
+            }
+                //HeaderCallButton.SetIcon(HeaderListButton.Camera);
+                //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 2);
+            else
+            {
+                HeaderCallButtonIconSig.StringValue = "Misc-09_Dark";
+            }
+            //HeaderCallButton.SetIcon(HeaderListButton.Phone);
+            //TriList.SetUshort(UIUshortJoin.CallHeaderButtonMode, 1);
+        }
+
        /// <summary>
        /// Sets up Header Buttons for the EssentialsHuddleVtc1Room type
        /// </summary>
--- a/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
+++ b/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
@@ -9,6 +9,7 @@ using Crestron.SimplSharpPro.UI;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Config;
+using PepperDash.Essentials.Core.DeviceTypeInterfaces;
 using PepperDash.Essentials.Core.SmartObjects;
 using PepperDash.Essentials.Core.PageManagers;
 using PepperDash.Essentials.Room.Config;
@@ -471,85 +472,92 @@ namespace PepperDash.Essentials
 		/// </summary>
 		void ShowNextMeetingTimerCallback()
 		{
+            //Update calendar for Zoom. Zoom doesn't automatically update when meetings are in the past
+            if (_isZoomRoomWithNoExternalSources)
+            {
+                CurrentRoom.ScheduleSource.GetSchedule();
+            }
+
 			// Every 60 seconds, refresh the calendar
 			RefreshMeetingsList();
 			// check meetings list for the closest, joinable meeting
 			var ss = CurrentRoom.ScheduleSource;
 			var meetings = ss.CodecSchedule.Meetings;

-			if (meetings.Count > 0)
-			{
-				// If the room is off pester the user
-				// If the room is on, and the meeting is joinable
-				// and the LastMeetingDismissed != this meeting
+		    if (meetings.Count <= 0)
+		    {
+		        return;
+		    }
+		    // If the room is off pester the user
+		    // If the room is on, and the meeting is joinable
+		    // and the LastMeetingDismissed != this meeting

-				var lastMeetingDismissed = meetings.FirstOrDefault(m => m.Id == LastMeetingDismissedId);
-				Debug.Console(0, "*#* Room on: {0}, lastMeetingDismissedId: {1} {2} *#*", 
-					CurrentRoom.OnFeedback.BoolValue,
-					LastMeetingDismissedId,
-                    lastMeetingDismissed != null ? lastMeetingDismissed.StartTime.ToString("t", Global.Culture) : "");
+		    var lastMeetingDismissed = meetings.FirstOrDefault(m => m.Id == LastMeetingDismissedId);
+		    Debug.Console(0, "*#* Room on: {0}, lastMeetingDismissedId: {1} {2} *#*", 
+		        CurrentRoom.OnFeedback.BoolValue,
+		        LastMeetingDismissedId,
+		        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();
+		    var meeting = meetings.LastOrDefault(m => m.Joinable);
+		    if (CurrentRoom.OnFeedback.BoolValue
+		        && lastMeetingDismissed == meeting)
+		    {
+		        // meeting no longer joinable, hide popup
+		        if(meeting == null)
+		            HideNextMeetingPopup();

-					return;
-				}
+		        return;
+		    }

-				LastMeetingDismissedId = null;
-				// Clear the popup when we run out of meetings
-				if (meeting == null)
-				{
-					HideNextMeetingPopup();
-				}
-				else
-				{
+		    LastMeetingDismissedId = null;
+		    // Clear the popup when we run out of meetings
+		    if (meeting == null)
+		    {
+		        HideNextMeetingPopup();
+		    }
+		    else
+		    {


-					TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
-                    TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToString("t", Global.Culture));
-                    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");
-					TriList.SetSigFalseAction(UIBoolJoin.NextMeetingJoinPress, () =>
-					{
-						HideNextMeetingPopup();
-						PopupInterlock.Hide();
-						RoomOnAndDialMeeting(meeting);
-					});
-					TriList.SetString(UIStringJoin.NextMeetingSecondaryButtonLabel, "Show Schedule");
-					TriList.SetSigFalseAction(UIBoolJoin.CalendarHeaderButtonPress, () =>
-					{
-						HideNextMeetingPopup();
-						//CalendarPress();
-						RefreshMeetingsList();
-						PopupInterlock.ShowInterlocked(UIBoolJoin.MeetingsOrContacMethodsListVisible);
-					});
-					var indexOfNext = meetings.IndexOf(meeting) + 1;
+		        TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Upcoming meeting");
+		        TriList.SetString(UIStringJoin.NextMeetingStartTimeText, meeting.StartTime.ToString("t", Global.Culture));
+		        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");
+		        TriList.SetSigFalseAction(UIBoolJoin.NextMeetingJoinPress, () =>
+		        {
+		            HideNextMeetingPopup();
+		            PopupInterlock.Hide();
+		            RoomOnAndDialMeeting(meeting);
+		        });
+		        TriList.SetString(UIStringJoin.NextMeetingSecondaryButtonLabel, "Show Schedule");
+		        TriList.SetSigFalseAction(UIBoolJoin.CalendarHeaderButtonPress, () =>
+		        {
+		            HideNextMeetingPopup();
+		            //CalendarPress();
+		            RefreshMeetingsList();
+		            PopupInterlock.ShowInterlocked(UIBoolJoin.MeetingsOrContacMethodsListVisible);
+		        });
+		        var indexOfNext = meetings.IndexOf(meeting) + 1;

-					// indexOf = 3, 4 meetings :  
-					if (indexOfNext < meetings.Count)
-						TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText,
-                            meetings[indexOfNext].StartTime.ToString("t", Global.Culture));
-					else
-						TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText, "No more meetings today");
+		        // indexOf = 3, 4 meetings :  
+		        if (indexOfNext < meetings.Count)
+		            TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText,
+		                meetings[indexOfNext].StartTime.ToString("t", Global.Culture));
+		        else
+		            TriList.SetString(UIStringJoin.NextMeetingFollowingMeetingText, "No more meetings today");

-					TriList.SetSigFalseAction(UIBoolJoin.NextMeetingModalClosePress, () =>
-						{
-							// Mark the meeting to not re-harass the user
-							if(CurrentRoom.OnFeedback.BoolValue)
-								LastMeetingDismissedId = meeting.Id;
-							HideNextMeetingPopup();
-						});
+		        TriList.SetSigFalseAction(UIBoolJoin.NextMeetingModalClosePress, () =>
+		        {
+		            // Mark the meeting to not re-harass the user
+		            if(CurrentRoom.OnFeedback.BoolValue)
+		                LastMeetingDismissedId = meeting.Id;
+		            HideNextMeetingPopup();
+		        });

-					TriList.SetBool(UIBoolJoin.NextMeetingModalVisible, true);
-				}
-			}
+		        TriList.SetBool(UIBoolJoin.NextMeetingModalVisible, true);
+		    }
 		}
 		
 		/// <summary>
@@ -575,19 +583,26 @@ namespace PepperDash.Essentials
 		/// </summary>
 		void RoomOnAndDialMeeting(Meeting meeting)
 		{
+		    Debug.Console(1, "[RoomOnAndDialMeeting] Joining meeting [{0}]", meeting);
 			Action dialAction = () => 
 				{
 					var d = CurrentRoom.ScheduleSource as VideoCodecBase;
                    if (d != null)
                    {
+                        Debug.Console(1,
+                            "[RoomOnAndDialMeeting] [dialAction] Sending command to codec to join meeting {0}", meeting);
                        d.Dial(meeting);
 						LastMeetingDismissedId = meeting.Id; // To prevent prompts for already-joined call
                    }
 				};
-			if (CurrentRoom.OnFeedback.BoolValue)
-				dialAction();
+		    if (CurrentRoom.OnFeedback.BoolValue)
+		    {
+                Debug.Console(1, "[RoomOnAndDialMeeting] Room is on.");
+		        dialAction();
+		    }
 			else
-			{
+		    {
+		        Debug.Console(1, "RoomOnAndDialMeeting] Room is off or warming. Registering for Warming Feedback");
 				// Rig a one-time handler to catch when the room is warmed and then dial call
 				EventHandler<FeedbackEventArgs> oneTimeHandler = null;
 				oneTimeHandler = (o, a) =>
@@ -716,16 +731,31 @@ namespace PepperDash.Essentials

            if (_isZoomRoomWithNoExternalSources)
            {
-                CurrentRoom.RunDefaultPresentRoute();
+                if (!CurrentRoom.OnFeedback.BoolValue)
+                {
+                    CurrentRoom.RunDefaultPresentRoute();
+                }
                // For now, if this is a Zoom Room and there are no shareable sources just display the informational subpage
                TriList.SetBool(UIBoolJoin.ZoomRoomContentSharingVisible, true);

                var presentationMeetingCodec = CurrentRoom.VideoCodec as IHasPresentationOnlyMeeting;
+                var farEndContentStatusCodec = CurrentRoom.VideoCodec as IHasFarEndContentStatus;
+                var receivingContent = false;
+
+                if (farEndContentStatusCodec != null)
+                {
+                    receivingContent = farEndContentStatusCodec.ReceivingContent.BoolValue;
+                }

                if (presentationMeetingCodec != null && !CurrentRoom.VideoCodec.IsInCall)
                {
                    presentationMeetingCodec.StartSharingOnlyMeeting(eSharingMeetingMode.Laptop);
                }
+                else if (CurrentRoom.VideoCodec.IsInCall && !CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue &&
+                         !receivingContent)
+                {
+                    CurrentRoom.VideoCodec.StartSharing();
+                }

                if (CurrentSourcePageManager != null)
                    CurrentSourcePageManager.Hide();
@@ -741,7 +771,9 @@ namespace PepperDash.Essentials
                }
                else // room is on show what's active or select a source if nothing is yet active
                {
-                    if (CurrentRoom.CurrentSourceInfo == null || (CurrentRoom.VideoCodec != null && CurrentRoom.CurrentSourceInfo.SourceDevice.Key == CurrentRoom.VideoCodec.OsdSource.Key))
+                    if (CurrentRoom.CurrentSourceInfo == null ||
+                        (CurrentRoom.VideoCodec != null &&
+                         CurrentRoom.CurrentSourceInfo.SourceDevice.Key == CurrentRoom.VideoCodec.OsdSource.Key))
                        TriList.SetBool(UIBoolJoin.SelectASourceVisible, true);
                    else if (CurrentSourcePageManager != null)
                    {
@@ -1086,13 +1118,18 @@ namespace PepperDash.Essentials

        void meetingInfoCodec_MeetingInfoChanged(object sender, MeetingInfoEventArgs e)
        {
+            if (e.Info == null)
+            {
+                return;
+            }
+
            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.SetBool(UIBoolJoin.MeetingPasswordVisible, !string.IsNullOrEmpty(e.Info.Password));

            TriList.SetString(UIStringJoin.CallSharedSourceNameText, e.Info.ShareStatus);

@@ -1302,9 +1339,8 @@ namespace PepperDash.Essentials
 		{
            // See if this is helpful or if the callback response in the codec class maybe doesn't come it time?
            // Let's build list from event
-			// CurrentRoom.ScheduleSource.GetSchedule();

-            TriList.SetString(UIStringJoin.MeetingsOrContactMethodListIcon, "Calendar");
+		    TriList.SetString(UIStringJoin.MeetingsOrContactMethodListIcon, "Calendar");
            TriList.SetString(UIStringJoin.MeetingsOrContactMethodListTitleText, "Today's Meetings");

 			ushort i = 0;
--- a/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
+++ b/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
@@ -327,20 +327,14 @@ namespace PepperDash.Essentials.UIDrivers.VC
            {
                case eCodecCallStatus.Connected:
                    // fire at SRL item
-                    HidePasswordPrompt();
-                    KeypadMode = eKeypadMode.DTMF;
-                    DialStringBuilder.Remove(0, DialStringBuilder.Length);
-                    DialStringFeedback.FireUpdate();
-					DialStringTextCheckEnables();
                    Parent.ShowNotificationRibbon("Connected", 2000);
-                    StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
-					ShowKeypad();
-                    ((Parent.CurrentRoom as IHasCurrentVolumeControls).CurrentVolumeControls as IBasicVolumeWithFeedback).MuteOff();
+                    OnCallConnected();
 					//VCControlsInterlock.ShowInterlocked(UIBoolJoin.VCKeypadVisible);
                    break;
                case eCodecCallStatus.Connecting:
                    // fire at SRL item
                    Parent.ShowNotificationRibbon("Connecting", 0);
+                    OnCallConnected();
                    break;
                case eCodecCallStatus.Dialing:
                    Parent.ShowNotificationRibbon("Connecting", 0);
@@ -417,6 +411,36 @@ namespace PepperDash.Essentials.UIDrivers.VC
            UpdateHeaderActiveCallList();
        }

+        private void OnCallConnected()
+        {
+            HidePasswordPrompt();
+            KeypadMode = eKeypadMode.DTMF;
+            DialStringBuilder.Remove(0, DialStringBuilder.Length);
+            DialStringFeedback.FireUpdate();
+            DialStringTextCheckEnables();
+
+            StagingButtonsFeedbackInterlock.ShowInterlocked(UIBoolJoin.VCStagingKeypadPress);
+            ShowKeypad();
+
+            UnmuteRoomOnCallConnect();
+        }
+
+        private void UnmuteRoomOnCallConnect()
+        {
+            var volControl = Parent.CurrentRoom as IHasCurrentVolumeControls;
+
+            if (volControl == null)
+            {
+                return;
+            }
+            var currentVolControls = volControl.CurrentVolumeControls as IBasicVolumeWithFeedback;
+
+            if (currentVolControls != null)
+            {
+                currentVolControls.MuteOff();
+            }
+        }
+
        /// <summary>
        /// Redraws the calls list on the header
        /// </summary>
--- a/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.nuspec
+++ b/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.nuspec
@@ -14,7 +14,7 @@
    <tags>crestron 3series 4series</tags>
    <repository type="git" url="https://github.com/PepperDash/Essentials"/>
    <dependencies>
-      <dependency id="PepperDashCore" version="[1.0.45, 1.1.0)"/>
+      <dependency id="PepperDashCore" version="[1.0.45, 2.0.0)"/>
    </dependencies>
  </metadata>
  <files>
--- a/DM/Essentials_DM/Chassis/DmChassisController.cs
+++ b/DM/Essentials_DM/Chassis/DmChassisController.cs
@@ -8,6 +8,7 @@ using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.DM;
 using Crestron.SimplSharpPro.DM.Cards;
 using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpProInternal;
 using Newtonsoft.Json;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
@@ -482,6 +483,24 @@ namespace PepperDash.Essentials.DM
            
        }

+        private void RegisterForInputResolutionFeedback(IVideoAttributesBasic input, uint number, RoutingInputPortWithVideoStatuses inputPort)
+        {
+            if (input == null)
+            {
+                return;
+            }
+
+            Debug.Console(1, this, "Registering for resolution feedback for input {0} using Routing Port {1}", number, inputPort.Key);
+
+            input.VideoAttributes.AttributeChange += (sender, args) =>
+            {
+                Debug.Console(1, this, "Input {0} resolution updated", number);
+
+                Debug.Console(1, this, "Updating resolution feedback for input {0}", number);
+                inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
+            };
+        }
+
        /// <summary>
        /// 
        /// </summary>
@@ -497,166 +516,189 @@ namespace PepperDash.Essentials.DM
            {
                case "dmchd":
                {
-                    var inputCard = new DmcHd(number, this.Chassis);
-                    var cecPort = inputCard.HdmiInput as ICec;
-                    AddHdmiInCardPorts(number, cecPort);
+                    var inputCard = new DmcHd(number, Chassis);
+                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
                }
                    break;
                case "dmchddsp":
                {
-                    var inputCard = new DmcHdDsp(number, this.Chassis);
-                    var cecPort = inputCard.HdmiInput as ICec;
-                    AddHdmiInCardPorts(number, cecPort);
+                    var inputCard = new DmcHdDsp(number, Chassis);
+                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
                }
                    break;
                case "dmc4khd":
                {
-                    var inputCard = new Dmc4kHd(number, this.Chassis);
-                    var cecPort = inputCard.HdmiInput as ICec;
-                    AddHdmiInCardPorts(number, cecPort);
+                    var inputCard = new Dmc4kHd(number, Chassis);
+                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
                }
                    break;
                case "dmc4khddsp":
                {
-                    var inputCard = new Dmc4kHdDsp(number, this.Chassis);
-                    var cecPort = inputCard.HdmiInput as ICec;
-                    AddHdmiInCardPorts(number, cecPort);
+                    var inputCard = new Dmc4kHdDsp(number, Chassis);
+                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
                }
                    break;
                case "dmc4kzhd":
                {
-                    var inputCard = new Dmc4kzHd(number, this.Chassis);
-                    var cecPort = inputCard.HdmiInput as ICec;
-                    AddHdmiInCardPorts(number, cecPort);
-                }
+                    var inputCard = new Dmc4kzHd(number, Chassis);
+                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
                    break;
+                }
                case "dmc4kzhddsp":
                {
-                    var inputCard = new Dmc4kzHdDsp(number, this.Chassis);
-                    var cecPort = inputCard.HdmiInput as ICec;
-                    AddHdmiInCardPorts(number, cecPort);
-                }
+                    var inputCard = new Dmc4kzHdDsp(number, Chassis);
+                    AddHdmiInCardPorts(number, inputCard.HdmiInput, inputCard.HdmiInput);
                    break;
+                }
                case "dmcc":
                {
-                    var inputCard = new DmcC(number, this.Chassis);
-                    var cecPort = inputCard.DmInput as ICec;
-                    AddDmInCardPorts(number, cecPort);
+                    var inputCard = new DmcC(number, Chassis);
+                    //DmInput doesn't implement ICec...cast was resulting in null anyway
+                    AddDmInCardPorts(number, null, inputCard.DmInput);
                }
                    break;
                case "dmccdsp":
                {
-                    var inputCard = new DmcCDsp(number, this.Chassis);
-                    var cecPort = inputCard.DmInput as ICec;
-                    AddDmInCardPorts(number, cecPort);
-                }
+                    var inputCard = new DmcCDsp(number, Chassis);
+                    //DmInput doesn't implement ICec...cast was resulting in null anyway
+                    AddDmInCardPorts(number, null, inputCard.DmInput);
                    break;
+                }
+                    
                case "dmc4kc":
                {
-                    var inputCard = new Dmc4kC(number, this.Chassis);
-                    var cecPort = inputCard.DmInput as ICec;
-                    AddDmInCardPorts(number, cecPort);
-                }
+                    var inputCard = new Dmc4kC(number, Chassis);
+                    AddDmInCardPorts(number, inputCard.DmInput,inputCard.DmInput);
                    break;
+                }
+                    
                case "dmc4kcdsp":
                {
-                    var inputCard = new Dmc4kCDsp(number, this.Chassis);
-                    var cecPort = inputCard.DmInput as ICec;
-                    AddDmInCardPorts(number, cecPort);
-                }
+                    var inputCard = new Dmc4kCDsp(number, Chassis);
+                    AddDmInCardPorts(number, inputCard.DmInput,inputCard.DmInput);
                    break;
+                }
+                    
                case "dmc4kzc":
                {
-                    var inputCard = new Dmc4kzC(number, this.Chassis);
-                    var cecPort = inputCard.DmInput as ICec;
-                    AddDmInCardPorts(number, cecPort);
-                }
+                    var inputCard = new Dmc4kzC(number, Chassis);
+                    AddDmInCardPorts(number, inputCard.DmInput,inputCard.DmInput);
                    break;
+                }
+                   
                case "dmc4kzcdsp":
                {
-                    var inputCard = new Dmc4kzCDsp(number, this.Chassis);
-                    var cecPort = inputCard.DmInput as ICec;
-                    AddDmInCardPorts(number, cecPort);
+                    var inputCard = new Dmc4kzCDsp(number, Chassis);
+                    AddDmInCardPorts(number, inputCard.DmInput, inputCard.DmInput);
+                    break;
                }
-                    break;
+                    
                case "dmccat":
-                    new DmcCat(number, this.Chassis);
-                    AddDmInCardPorts(number);
+                {
+                    var inputCard = new DmcCat(number, Chassis);
+                    AddDmInCardPorts(number, null, inputCard.DmInput);
                    break;
+                }
                case "dmccatdsp":
-                    new DmcCatDsp(number, this.Chassis);
-                    AddDmInCardPorts(number);
+                {
+                    var inputCard = new DmcCatDsp(number, Chassis);
+                    AddDmInCardPorts(number, null, inputCard.DmInput);
                    break;
+                }
                case "dmcs":
-                    new DmcS(number, Chassis);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
+                {
+                    var inputCard = new DmcS(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, null, inputCard.DmInput);
                    AddInCardHdmiAndAudioLoopPorts(number);
                    break;
+                }
                case "dmcsdsp":
-                    new DmcSDsp(number, Chassis);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber);
+                {
+                    var inputCard = new DmcSDsp(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmMmFiber, null, inputCard.DmInput);
                    AddInCardHdmiAndAudioLoopPorts(number);
                    break;
+                }
                case "dmcs2":
-                    new DmcS2(number, Chassis);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
+                {
+                    var inputCard = new DmcS2(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, null, inputCard.DmInput);
                    AddInCardHdmiAndAudioLoopPorts(number);
                    break;
+                }
                case "dmcs2dsp":
-                    new DmcS2Dsp(number, Chassis);
-                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber);
+                {
+                    var inputCard = new DmcS2Dsp(number, Chassis);
+                    AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmSmFiber, null, inputCard.DmInput);
                    AddInCardHdmiAndAudioLoopPorts(number);
                    break;
+                }
                case "dmcsdi":
-                    new DmcSdi(number, Chassis);
-                    AddInputPortWithDebug(number, "sdiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Sdi);
+                {
+                    var inputCard = new DmcSdi(number, Chassis);
+                    AddInputPortWithDebug(number, "sdiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Sdi, null, inputCard.SdiInput);
                    AddOutputPortWithDebug(string.Format("inputCard{0}", number), "sdiOut", eRoutingSignalType.Audio | eRoutingSignalType.Video,
                        eRoutingPortConnectionType.Sdi, null);
                    AddInCardHdmiAndAudioLoopPorts(number);
                    break;
+                }
                case "dmcdvi":
-                    new DmcDvi(number, Chassis);
-                    AddInputPortWithDebug(number, "dviIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Dvi);
+                {
+                    var inputCard = new DmcDvi(number, Chassis);
+                    AddInputPortWithDebug(number, "dviIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Dvi, null, inputCard.DviInput);
                    AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                    AddInCardHdmiLoopPort(number);
                    break;
+                }
                case "dmcvga":
-                    new DmcVga(number, Chassis);
-                    AddInputPortWithDebug(number, "vgaIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Vga);
+                {
+                    var inputCard = new DmcVga(number, Chassis);
+                    AddInputPortWithDebug(number, "vgaIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Vga, null, inputCard.VgaInput);
                    AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                    AddInCardHdmiLoopPort(number);
                    break;
+                }
                case "dmcvidbnc":
-                    new DmcVidBnc(number, Chassis);
-                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
+                {
+                    var inputCard = new DmcVidBnc(number, Chassis);
+                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component, null, inputCard.VideoInput);
                    AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                    AddInCardHdmiLoopPort(number);
                    break;
+                }
                case "dmcvidrcaa":
-                    new DmcVidRcaA(number, Chassis);
-                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
+                {
+                    var inputCard = new DmcVidRcaA(number, Chassis);
+                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component, null, inputCard.VideoInput);
                    AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.LineAudio);
                    AddInCardHdmiLoopPort(number);
                    break;
+                }
                case "dmcvidrcad":
-                    new DmcVidRcaD(number, Chassis);
-                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component);
+                {
+                    var inputCard = new DmcVidRcaD(number, Chassis);
+                    AddInputPortWithDebug(number, "componentIn", eRoutingSignalType.Video, eRoutingPortConnectionType.Component, null, inputCard.VideoInput);
                    AddInputPortWithDebug(number, "audioIn", eRoutingSignalType.Audio, eRoutingPortConnectionType.DigitalAudio);
                    AddInCardHdmiLoopPort(number);
                    break;
+                }
                case "dmcvid4":
-                    new DmcVid4(number, Chassis);
+                {
+                    var inputCard = new DmcVid4(number, Chassis);
                    AddInputPortWithDebug(number, "compositeIn1", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                    AddInputPortWithDebug(number, "compositeIn2", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                    AddInputPortWithDebug(number, "compositeIn3", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                    AddInputPortWithDebug(number, "compositeIn4", eRoutingSignalType.Video, eRoutingPortConnectionType.Composite);
                    AddInCardHdmiLoopPort(number);
                    break;
+                }
                case "dmcstr":
-                    new DmcStr(number, Chassis);
-                    AddInputPortWithDebug(number, "streamIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming);
+                {
+                    var inputCard = new DmcStr(number, Chassis);
+                    AddInputPortWithDebug(number, "streamIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Streaming, null, inputCard.Source);
                    AddInCardHdmiAndAudioLoopPorts(number);
                    break;
+                }
            }
        }

@@ -672,12 +714,24 @@ namespace PepperDash.Essentials.DM
            AddInCardHdmiAndAudioLoopPorts(number);
        }

+        void AddDmInCardPorts(uint number, ICec cecPort, IVideoAttributesBasic videoAttributes)
+        {
+            AddInputPortWithDebug(number, "dmIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, cecPort, videoAttributes);
+            AddInCardHdmiAndAudioLoopPorts(number);
+        }
+
        void AddHdmiInCardPorts(uint number, ICec cecPort)
        {
            AddInputPortWithDebug(number, "hdmiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, cecPort);
            AddInCardHdmiAndAudioLoopPorts(number);
        }

+        void AddHdmiInCardPorts(uint number, ICec cecPort, IVideoAttributesBasic videoAttributes)
+        {
+            AddInputPortWithDebug(number, "hdmiIn", eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.Hdmi, cecPort, videoAttributes);
+            AddInCardHdmiAndAudioLoopPorts(number);
+        }
+
        void AddInCardHdmiAndAudioLoopPorts(uint number)
        {
            AddOutputPortWithDebug(string.Format("inputCard{0}", number), "hdmiLoopOut", eRoutingSignalType.Audio | eRoutingSignalType.Video,
@@ -816,20 +870,55 @@ namespace PepperDash.Essentials.DM
        /// </summary>
        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType)
        {
-            AddInputPortWithDebug(cardNum, portName, sigType, portType, null);
+            //Cast is necessary here to determine the correct overload
+            AddInputPortWithDebug(cardNum, portName, sigType, portType, null, null);
+        }
+
+        private void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType,
+            eRoutingPortConnectionType portType, ICec cecPort)
+        {
+            //Cast is necessary here to determine the correct overload
+            AddInputPortWithDebug(cardNum, portName, sigType, portType, cecPort, null);
        }

        /// <summary>
-        /// Adds InputPort and sets Port as ICec object
+        /// Adds InputPort and sets Port as ICec object. If videoAttributesBasic is defined, RoutingPort will be RoutingInputPortWithVideoStatuses
        /// </summary>
-        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, ICec cecPort)
+        void AddInputPortWithDebug(uint cardNum, string portName, eRoutingSignalType sigType, eRoutingPortConnectionType portType, ICec cecPort, IVideoAttributesBasic videoAttributesBasic)
        {
            var portKey = string.Format("inputCard{0}--{1}", cardNum, portName);
            Debug.Console(2, this, "Adding input port '{0}'", portKey);
-            var inputPort = new RoutingInputPort(portKey, sigType, portType, Chassis.Inputs[cardNum], this)
+
+            RoutingInputPort inputPort;
+
+            if (videoAttributesBasic != null)
            {
-                FeedbackMatchObject = Chassis.Inputs[cardNum]
-            }; ;
+                Debug.Console(1, this, "card {0} supports IVideoAttributesBasic", cardNum);
+                var statusFuncs = new VideoStatusFuncsWrapper
+                {
+                    VideoResolutionFeedbackFunc = () =>
+                    {
+                        var resolution = videoAttributesBasic.VideoAttributes.GetVideoResolutionString();
+                        Debug.Console(1, this, "Updating resolution for input {0}. New resolution: {1}", cardNum, resolution);
+                        return resolution;
+                    }
+                };
+                inputPort = new RoutingInputPortWithVideoStatuses(portKey, sigType, portType,
+                    Chassis.Inputs[cardNum], this, statusFuncs)
+                {
+                    FeedbackMatchObject = Chassis.Inputs[cardNum]
+                };
+
+                RegisterForInputResolutionFeedback(videoAttributesBasic, cardNum, inputPort as RoutingInputPortWithVideoStatuses);
+            }
+            else
+            {
+                inputPort = new RoutingInputPort(portKey, sigType, portType,
+                    Chassis.Inputs[cardNum], this)
+                {
+                    FeedbackMatchObject = Chassis.Inputs[cardNum]
+                };
+            }

            if (cecPort != null)
                inputPort.Port = cecPort;
@@ -989,6 +1078,23 @@ namespace PepperDash.Essentials.DM
                                Debug.Console(2, this, "No index of {0} found in InputStreamCardStateFeedbacks");
                            break;
                        }
+                    case DMInputEventIds.HorizontalResolutionFeedbackEventId:
+                    case DMInputEventIds.VerticalResolutionFeedbackEventId:
+                    case DMInputEventIds.FramesPerSecondFeedbackEventId:
+                    case DMInputEventIds.ResolutionEventId:
+                    {
+                        Debug.Console(1, this, "Input {0} resolution updated", args.Number);
+                        var inputPort =
+                            InputPorts.Cast<RoutingInputPortWithVideoStatuses>()
+                                .FirstOrDefault((ip) => ip.Key.Contains(String.Format("inputCard{0}", args.Number)));
+
+                        if (inputPort != null)
+                        {
+                            Debug.Console(1, this, "Updating resolution feedback for input {0}", args.Number);
+                            inputPort.VideoStatus.VideoResolutionFeedback.FireUpdate();
+                        }
+                        break;
+                    }
                    default:
                        {
                            Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);
@@ -1050,7 +1156,7 @@ namespace PepperDash.Essentials.DM
                    var inputNumber = Chassis.Outputs[output].VideoOutFeedback == null ? 0 : Chassis.
                    Outputs[output].VideoOutFeedback.Number;

-                    Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", this.Name, inputNumber, output);
+                    Debug.Console(2, this, "DMSwitchVideo:{0} Routed Input:{1} Output:{2}'", Name, inputNumber, output);

                    if (VideoOutputFeedbacks.ContainsKey(output))
                    {
@@ -1077,7 +1183,7 @@ namespace PepperDash.Essentials.DM
                    var inputNumber = Chassis.Outputs[output].AudioOutFeedback == null ? 0 : Chassis.
                    Outputs[output].AudioOutFeedback.Number;

-                    Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", this.Name, inputNumber, output);
+                    Debug.Console(2, this, "DMSwitchAudio:{0} Routed Input:{1} Output:{2}'", Name, inputNumber, output);

                    if (AudioOutputFeedbacks.ContainsKey(output))
                    {
@@ -1388,6 +1494,16 @@ namespace PepperDash.Essentials.DM
            {
                trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber + ioSlotJoin].UShortValue = 1;
            }
+
+            var videoStatus = inputPort as RoutingInputPortWithVideoStatuses;
+
+            if (videoStatus == null)
+            {
+                return;
+            }
+
+            Debug.Console(1, this, "Linking {0} to join {1} for resolution feedback.", videoStatus.Key, joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin);
+            videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
        }

        private void LinkStreamInputToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap, uint ioSlotJoin)
@@ -1428,6 +1544,13 @@ namespace PepperDash.Essentials.DM
            InputStreamCardStateFeedbacks[ioSlot].LinkInputSig(trilist.UShortInput[join]);

            trilist.UShortInput[join].UShortValue = InputStreamCardStateFeedbacks[ioSlot].UShortValue;
+
+            var videoStatus = inputPort as RoutingInputPortWithVideoStatuses;
+
+            if (videoStatus != null)
+            {
+                videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
+            }
        }

        private void LinkStreamOutputToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap, uint ioSlotJoin)
@@ -1564,10 +1687,19 @@ namespace PepperDash.Essentials.DM
            {
                trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber + ioSlotJoin].UShortValue = 1;
            }
+
+            var videoStatus = inputPort as RoutingInputPortWithVideoStatuses;
+
+            if (videoStatus == null)
+            {
+                return;
+            }
+            Debug.Console(1, this, "Linking {0} to join {1} for resolution feedback.", videoStatus.Key, joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin);
+            videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
        }

        private void LinkAdvancedTxToApi(BasicTriList trilist, DmChassisControllerJoinMap joinMap,
-           uint ioSlot, uint ioSlotJoin, BasicDmTxControllerBase basicTransmitter)
+            uint ioSlot, uint ioSlotJoin, BasicDmTxControllerBase basicTransmitter)
        {
            var transmitter = basicTransmitter as DmTxControllerBase;
            if (transmitter == null) return;
@@ -1581,7 +1713,9 @@ namespace PepperDash.Essentials.DM

            if (txRoutingInputs == null) return;

-            var inputPorts = txRoutingInputs.InputPorts.Where((p) => p.Port is EndpointHdmiInput || p.Port is EndpointDisplayPortInput).ToList();
+            var inputPorts =
+                txRoutingInputs.InputPorts.Where(
+                    (p) => p.Port is EndpointHdmiInput || p.Port is EndpointDisplayPortInput).ToList();

            if (inputPorts.Count == 0)
            {
@@ -1614,6 +1748,19 @@ namespace PepperDash.Essentials.DM

            trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber + ioSlotJoin].UShortValue =
                (ushort) transmitter.HdcpSupportCapability;
+
+
+            var videoStatus =
+                InputPorts[string.Format("inputCard{0}--dmIn", ioSlot)] as RoutingInputPortWithVideoStatuses;
+
+            if (videoStatus == null)
+            {
+                return;
+            }
+            Debug.Console(1, this, "Linking {0} to join {1} for resolution feedback.", videoStatus.Key,
+                joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin);
+            videoStatus.VideoStatus.VideoResolutionFeedback.LinkInputSig(
+                trilist.StringInput[joinMap.InputCurrentResolution.JoinNumber + ioSlotJoin]);
        }

        private void LinkTxOnlineFeedbackToApi(BasicTriList trilist, uint ioSlot, DmChassisControllerJoinMap joinMap,
@@ -1896,15 +2043,15 @@ namespace PepperDash.Essentials.DM
            {

                var props = JsonConvert.DeserializeObject
-                    <PepperDash.Essentials.DM.Config.DMChassisPropertiesConfig>(dc.Properties.ToString());
-                return PepperDash.Essentials.DM.DmChassisController.
+                    <DMChassisPropertiesConfig>(dc.Properties.ToString());
+                return DmChassisController.
                    GetDmChassisController(dc.Key, dc.Name, type, props);
            }
            else if (type.StartsWith("dmmd128x") || type.StartsWith("dmmd64x"))
            {
                var props = JsonConvert.DeserializeObject
-                    <PepperDash.Essentials.DM.Config.DMChassisPropertiesConfig>(dc.Properties.ToString());
-                return PepperDash.Essentials.DM.DmBladeChassisController.
+                    <DMChassisPropertiesConfig>(dc.Properties.ToString());
+                return DmBladeChassisController.
                    GetDmChassisController(dc.Key, dc.Name, type, props);
            }

--- a/Common/Codec/iHasScheduleAwareness.cs
+++ b/Common/Codec/iHasScheduleAwareness.cs
@@ -235,6 +235,15 @@ namespace PepperDash.Essentials.Devices.Common.Codec
        {
            Calls = new List<Call>();
        }
+
+        #region Overrides of Object
+
+        public override string ToString()
+        {
+            return String.Format("{0}:{1}: {2}-{3}", Title, Agenda, StartTime, EndTime);
+        }
+
+        #endregion
    }

    public class Call
--- a/Common/VideoCodec/Interfaces/IHasMeetingInfo.cs
+++ b/Common/VideoCodec/Interfaces/IHasMeetingInfo.cs
@@ -38,8 +38,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
        public Boolean IsHost { get; private set; }
        [JsonProperty("isSharingMeeting")]
        public Boolean IsSharingMeeting { get; private set; }
+        [JsonProperty("waitingForHost")]
+        public Boolean WaitingForHost { get; private set; }

-        public MeetingInfo(string id, string name, string host, string password, string shareStatus, bool isHost, bool isSharingMeeting)
+        public MeetingInfo(string id, string name, string host, string password, string shareStatus, bool isHost, bool isSharingMeeting, bool waitingForHost)
        {
            Id = id;
            Name = name;
@@ -48,6 +50,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces
            ShareStatus = shareStatus;
            IsHost = isHost;
            IsSharingMeeting = isSharingMeeting;
+            WaitingForHost = waitingForHost;
        }
    }

--- a/Common/VideoCodec/ZoomRoom/ResponseObjects.cs
+++ b/Common/VideoCodec/ZoomRoom/ResponseObjects.cs
@@ -59,6 +59,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		public List<zStatus.AudioVideoInputOutputLineItem> AudioOuputs { get; set; }
 		public List<zStatus.AudioVideoInputOutputLineItem> Cameras { get; set; }
 		public zEvent.PhoneCallStatus PhoneCall { get; set; }
+        public zEvent.NeedWaitForHost NeedWaitForHost { get; set; }

 		public ZoomRoomStatus()
 		{
@@ -76,6 +77,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			AudioOuputs = new List<zStatus.AudioVideoInputOutputLineItem>();
 			Cameras = new List<zStatus.AudioVideoInputOutputLineItem>();
 			PhoneCall = new zEvent.PhoneCallStatus();
+		    NeedWaitForHost = new zEvent.NeedWaitForHost();
 		}
 	}

@@ -1475,6 +1477,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 			public static List<Participant> GetGenericParticipantListFromParticipantsResult(
 				List<ListParticipant> participants)
 			{
+			    if (participants.Count == 0)
+			    {
+			        return new List<Participant>();
+			    }
 				//return participants.Select(p => new Participant
 				//            {
 				//                UserId = p.UserId,
--- a/Common/VideoCodec/ZoomRoom/ZoomRoom.cs
+++ b/Common/VideoCodec/ZoomRoom/ZoomRoom.cs
@@ -112,6 +112,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

 			CodecSchedule = new CodecScheduleAwareness(MeetingRefreshTimer);

+		    if (_props.MinutesBeforeMeetingStart > 0)
+		    {
+		        CodecSchedule.MeetingWarningMinutes = _props.MinutesBeforeMeetingStart;
+		    }
+
 			ReceivingContent = new BoolFeedback(FarEndIsSharingContentFeedbackFunc);

 			SelfviewPipPositionFeedback = new StringFeedback(SelfviewPipPositionFeedbackFunc);
@@ -494,19 +499,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                {
                    var sharingStatus = GetSharingStatus();

-                    MeetingInfo = new MeetingInfo("", "", "", "", sharingStatus, GetIsHostMyself(), true);
+                    MeetingInfo = new MeetingInfo("", "", "", "", sharingStatus, GetIsHostMyself(), true, false);
                    return;
                }

                var meetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, Participants.Host != null ? Participants.Host.Name : "None",
-                    MeetingInfo.Password, GetSharingStatus(), GetIsHostMyself(), MeetingInfo.IsSharingMeeting);
+                    MeetingInfo.Password, GetSharingStatus(), GetIsHostMyself(), MeetingInfo.IsSharingMeeting, MeetingInfo.WaitingForHost);
                MeetingInfo = meetingInfo;
            }
            catch (Exception e)
            {
                Debug.Console(1, this, "Error processing state property update. {0}", e.Message);
                Debug.Console(2, this, e.StackTrace);
-                MeetingInfo = new MeetingInfo("", "", "", "", "None", false, false);
+                MeetingInfo = new MeetingInfo("", "", "", "", "None", false, false, false);
            }
 	    }

@@ -651,13 +656,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                        {
                            Debug.Console(2, this, "Updating sharing status: {0}", a.PropertyName);

+                            SharingContentIsOnFeedback.FireUpdate();
                            if (MeetingInfo == null)
                            {
                                //Ignoring for now, as the CallInfo return will create the appropriate value
                                return;
                            }
                            // Update the share status of the meeting info
-                            var meetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, MeetingInfo.Host, MeetingInfo.Password, GetSharingStatus(), GetIsHostMyself(), MeetingInfo.IsSharingMeeting);
+                            var meetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, MeetingInfo.Host, MeetingInfo.Password, GetSharingStatus(), GetIsHostMyself(), MeetingInfo.IsSharingMeeting, MeetingInfo.WaitingForHost);
                            MeetingInfo = meetingInfo;
                            break;
                        }
@@ -1229,7 +1235,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								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, GetIsHostMyself(), MeetingInfo.IsSharingMeeting);
+                                var meetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, Participants.Host.Name, MeetingInfo.Password, MeetingInfo.ShareStatus, GetIsHostMyself(), MeetingInfo.IsSharingMeeting, MeetingInfo.WaitingForHost);
                                MeetingInfo = meetingInfo;

 								PrintCurrentCallParticipants();
@@ -1424,15 +1430,40 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 							}
 							case "needwaitforhost":
 							{
-								var needWait =
-									JsonConvert.DeserializeObject<zEvent.NeedWaitForHost>(responseObj.ToString());
+                                Status.NeedWaitForHost = JsonConvert.DeserializeObject<zEvent.NeedWaitForHost>(responseObj.ToString());

-								if (needWait.Wait)
-								{
-									// TODO: notify user to wait for host
-								}
+							    Debug.Console(1, this, "NeedWaitForHost: {0}", Status.NeedWaitForHost.Wait);

-								break;
+                                if (Status.NeedWaitForHost.Wait)
+							    {
+							        if (MeetingInfo == null)
+							        {
+							            MeetingInfo = new MeetingInfo("Waiting For Host", "Waiting For Host", "Waiting For Host", "",
+							                GetSharingStatus(), false, false, true);
+
+                                        UpdateCallStatus();
+							            break;
+							        }
+
+                                    MeetingInfo = new MeetingInfo("Waiting For Host", "Waiting For Host", "Waiting For Host", "",
+							            GetSharingStatus(), false, false, true);
+
+							        UpdateCallStatus();
+
+							        break;
+							    }
+
+							    if (MeetingInfo == null)
+							    {
+							        MeetingInfo = new MeetingInfo("Waiting For Host", "Waiting For Host", "Waiting For Host", "",
+							            GetSharingStatus(), false, false, false);
+							        break;
+							    }
+
+							    MeetingInfo = new MeetingInfo(MeetingInfo.Id, MeetingInfo.Name, MeetingInfo.Host, MeetingInfo.Password,
+							        GetSharingStatus(), GetIsHostMyself(), false, false);
+
+							    break;
 							}
 							case "openvideofailforhoststop":
 							{
@@ -1514,7 +1545,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

 						        if (result.Success)
 						        {
-						            MeetingInfo = new MeetingInfo("", "", "", "", "", true, true);
+						            MeetingInfo = new MeetingInfo("", "", "", "", "", true, true, MeetingInfo.WaitingForHost);
 						            break;
 						        }

@@ -1704,8 +1735,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		/// </summary>
 		private void UpdateCallStatus()
 		{
-			Debug.Console(1, this, "[UpdateCallStatus] Current Call Status: {0}",
-				Status.Call != null ? Status.Call.Status.ToString() : "no call");
+		    Debug.Console(1, this,
+		        "[UpdateCallStatus] Current Call Status: {0} Active Call Count: {1} Need Wait For Host: {2}",
+		        Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count, Status.NeedWaitForHost.Wait);

 			if (Status.Call != null)
 			{
@@ -1750,17 +1782,32 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 								Type = eCodecCallType.Video,
 							};

+						    if (!String.IsNullOrEmpty(_lastDialedMeetingNumber))
+						    {
+						        _lastDialedMeetingNumber = String.Empty;
+						    }
 							ActiveCalls.Add(newCall);

-                            //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);
-
 							OnCallStatusChange(newCall);
-						}
-						else
+						} else if (String.IsNullOrEmpty(Status.Call.Info.meeting_id) && Status.NeedWaitForHost.Wait)
 						{
-                            //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);
+                            var newCall = new CodecActiveCallItem
+                            {
+                                Name = "Waiting For Host",
+                                Number = "Waiting For Host",
+                                Id = "Waiting For Host",
+                                Status = newStatus,
+                                Type = eCodecCallType.Video,
+                            };
+
+                            if (!String.IsNullOrEmpty(_lastDialedMeetingNumber))
+                            {
+                                _lastDialedMeetingNumber = String.Empty;
+                            }
+
+                            ActiveCalls.Add(newCall);
+
+                            OnCallStatusChange(newCall);
 						}
 					}
 				}
@@ -1771,15 +1818,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 					switch (callStatus)
 					{
 						case zStatus.eCallStatus.IN_MEETING:
+                            if (Status.NeedWaitForHost.Wait)
+                            {
+                                Status.NeedWaitForHost.Wait = false;
+                            }
 							existingCall.Status = eCodecCallStatus.Connected;
 							break;
 						case zStatus.eCallStatus.NOT_IN_MEETING:
+					        if (Status.NeedWaitForHost.Wait)
+					        {
+					            Status.NeedWaitForHost.Wait = false;
+					        }
 							existingCall.Status = eCodecCallStatus.Disconnected;
 							break;
 					}

 					Debug.Console(1, this, "[UpdateCallStatus] ELSE ActiveCalls.Count == {1} - Current Call Status: {0}",
 						Status.Call != null ? Status.Call.Status.ToString() : "no call", ActiveCalls.Count);
+				    

 					OnCallStatusChange(existingCall);
 				}
@@ -1833,7 +1889,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
                    Status.Call.Info.meeting_password,
                    GetSharingStatus(),
                    GetIsHostMyself(),
-                    !String.Equals(Status.Call.Info.meeting_type,"NORMAL")
+                    !String.Equals(Status.Call.Info.meeting_type,"NORMAL"),
+                    false
                    );
            }

@@ -1923,7 +1980,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom
 		/// </summary>
 		public override void StopSharing()
 		{
-			SendText("zCommand Call Sharing Disconnect");
+		    if (Status.Sharing.isSharingBlackMagic)
+		    {
+		        SendText("zCommand Call Sharing HDMI Stop");
+		    }
+		    else
+		    {
+		        SendText("zCommand Call Sharing Disconnect");
+		    }
 		}

 		public override void PrivacyModeOn()
--- a/Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs
+++ b/Common/VideoCodec/ZoomRoom/ZoomRoomPropertiesConfig.cs
@@ -25,5 +25,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom

        //This layout will be selected when a call is connected and no content is being shared
        public string DefaultCallLayout { get; set; }
+
+        public int MinutesBeforeMeetingStart { get; set; }
    }
 }
Author	SHA1	Message	Date
Neil Dorin	63b9ffdd26	Merge branch 'main' into hotfix/dm-resolution-issues	2021-09-21 10:17:26 -06:00
Andrew Welker	2e76b6ba0a	fix(DM): Fix issue with bad cast for IVideoAttributesBasic Also updates to use the DM routing input port rather than the tx AnyVideoInput for the DM input resolutions	2021-09-21 09:40:51 -06:00
Andrew Welker	cad45c04cb	fix: Add method to register for the correct event for resolution feedback The resolution feedback change events don't appear to bubble up to the main DMInput change event. It appears to require subscribing to an event on the VideoAttributes class that the input contains.	2021-09-20 16:12:39 -06:00
Neil Dorin	0d6cd8d55d	Merge pull request #822 from PepperDash/hotfix/ci-newtonsoft-issues ci: Update scripts to remove Newtonsoft.Compact.json	2021-09-20 14:24:11 -06:00
Neil Dorin	8e64140651	Merge branch 'main' into hotfix/ci-newtonsoft-issues	2021-09-20 13:28:54 -06:00
Neil Dorin	0da35c8572	Merge pull request #827 from PepperDash/hotfix/zoom-updates Hotfix/zoom updates	2021-09-20 13:26:18 -06:00
Andrew Welker	9f3a3f64a8	fix: Update share behavior for Zoom Room	2021-09-16 13:27:09 -06:00
Andrew Welker	fe01842523	fix: Multiple fixes Update to poll meetings every 60 seconds Add property to allow for adjusting when Join button appears Refactor call connected event handler Adjust text for header for sharing-only meeting Add logic to handle waiting for host state	2021-09-16 07:15:26 -06:00
Andrew Welker	73e3b049d8	build: Update nuspec file for maximum PD Core version	2021-09-13 08:33:36 -06:00
Andrew Welker	0ae38dddfc	ci: Update scripts to remove Newtonsoft.Compact.json	2021-09-11 14:01:07 -06:00
Andrew Welker	fa6cabe246	refactor(Essentials_DM): Add event IDS and some logging to get resolution feedback	2021-09-09 07:44:05 -06:00
Andrew Welker	db3d96d448	feat(Essentials_DM): Update DmInputEvent handler for input resolution feedback	2021-09-08 15:26:16 -06:00
Andrew Welker	a28a078c4f	feat(Essentials_DM): Update all card creation methods to pass appropriate input	2021-09-08 15:25:43 -06:00
Andrew Welker	d00a31e3a6	feat(Essentials_DM): Add overloads for `AddDmInCardPorts` & `AddHdmiInCardPorts`	2021-09-08 14:17:24 -06:00
Andrew Welker	77134f0a30	feat:(Essentials_DM) Update AddInputPortWithDebug Adding an `IVideoAttributesBasic` as a parameter for this method relatively easily allows us to get the reported input resolution when it changes.	2021-09-08 14:15:52 -06:00