Merge remote-tracking branch 'origin/feature/ecs-407' into feature/cisco-spark-2

Conflicts:
	Essentials Devices Common/Essentials Devices Common/Codec/CodecActiveCallItem.cs

Essentials Core/PepperDashEssentialsBase/Devices/CodecInterfaces.cs

@@ -6,35 +6,6 @@ using Crestron.SimplSharp;
 
 namespace PepperDash.Essentials.Core
 {
-    /// <summary>
-    /// Requirements for a device that has dialing capabilities
-    /// </summary>
-    public interface IHasDialer
-    {
-        // Add requirements for Dialer functionality
-
-        void Dial(string number);
-        void EndCall(object activeCall);
-        void EndAllCalls();
-        void AcceptCall();
-        void RejectCall();
-        void SendDtmf(string digit);
-
-        IntFeedback ActiveCallCountFeedback { get; }
-        BoolFeedback IncomingCallFeedback { get; }
-
-
-        
-    }
-
-    /// <summary>
-    /// Defines minimum volume controls for a codec device with dialing capabilities
-    /// </summary>
-    public interface ICodecAudio : IBasicVolumeWithFeedback, IPrivacy
-    {
-
-    }
-
     /// <summary>
     /// Adds control of codec receive volume
     /// </summary>
@@ -72,20 +43,4 @@ namespace PepperDash.Essentials.Core
         void PrivacyModeToggle();
         BoolFeedback PrivacyModeIsOnFeedback { get; }
     }
-
-    public interface IHasCallHistory
-    {
-        // Add recent calls list
-    }
-
-    public interface IHasDirectory
-    {
-
-    }
-
-    public interface IHasObtp
-    {
-
-        // Upcoming Meeting warning event
-    }
 }

Essentials Devices Common/Essentials Devices Common/Codec/CodecActiveCallItem.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Crestron.SimplSharp;
 
-namespace PepperDash.Essentials.Devices.Common.VideoCodec
+namespace PepperDash.Essentials.Devices.Common.Codec
 
 {
     public class CodecActiveCallItem
@@ -24,18 +24,4 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         public object CallMetaData { get; set; }
     }
 
-    public enum eCodecCallType
-    {
-        Unknown = 0, Audio, Video, AudioCanEscalate, ForwardAllCall
-    }
-
-    public enum eCodecCallStatus
-    {
-        Unknown = 0, Idle, Dialing, Ringing, Connecting, Connected, Disconnecting, Incoming, OnHold, EarlyMedia, Preserved, RemotePreserved, Disconnected
-    }
-
-    public enum eCodecCallDirection
-    {
-        Unknown = 0, Incoming, Outgoing
-    }
 }

Essentials Devices Common/Essentials Devices Common/Codec/CodecActiveCallItem.cs.orig

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
+
+{
+    public class CodecActiveCallItem
+    {
+        public string Name { get; set; }
+
+        public string Number { get; set; }
+
+<<<<<<< HEAD:Essentials Devices Common/Essentials Devices Common/Codec/CodecActiveCallItem.cs
+        public eCodecCallType Type { get; set; }
+
+        public eCodecCallStatus Status { get; set; }
+
+        public string Id { get; set; }
+=======
+        public eCodecCallType Type { get; set; }
+
+        public eCodecCallStatus Status { get; set; }
+
+        public string Id { get; set; }
+
+        public object CallMetaData { get; set; }
+>>>>>>> origin/feature/cisco-spark-2:Essentials Devices Common/Essentials Devices Common/VideoCodec/CodecActiveCallItem.cs
+    }
+
+    public enum eCodecCallType
+    {
+        Unknown = 0, Audio, Video
+<<<<<<< HEAD:Essentials Devices Common/Essentials Devices Common/Codec/CodecActiveCallItem.cs
+    }
+
+    public enum eCodecCallStatus
+    {
+        Unknown = 0, Dialing, Connected, Incoming, OnHold, Disconnected
+=======
+    }
+
+    public enum eCodecCallStatus
+    {
+        Unknown = 0, Dialing, Connected, Incoming, OnHold, Disconnected
+>>>>>>> origin/feature/cisco-spark-2:Essentials Devices Common/Essentials Devices Common/VideoCodec/CodecActiveCallItem.cs
+    }
+}

Essentials Devices Common/Essentials Devices Common/Codec/eCodecCallDirection.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
+
+{
+    public enum eCodecCallDirection
+    {
+        Unknown = 0, Incoming, Outgoing
+    }
+}

Essentials Devices Common/Essentials Devices Common/Codec/eCodecCallStatus.cs

@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
+
+{
+    public enum eCodecCallStatus
+    {
+        Unknown = 0,
+        Idle,
+        Dialing,
+        Ringing,
+        Connecting,
+        Connected,
+        Disconnecting,
+        Incoming,
+        OnHold,
+        EarlyMedia,
+        Preserved,
+        RemotePreserved,
+        Disconnected
+    }
+
+    public class CodecCallStatus
+    {
+
+        /// <summary>
+        /// Takes the Cisco status and converts to the matching enum
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        public static eCodecCallStatus ConvertToStatusEnum(string s)
+        {
+            switch (s)
+            {
+                case "Idle":
+                    {
+                        return eCodecCallStatus.Idle;
+                    }
+                case "Dialling":
+                    {
+                        return eCodecCallStatus.Dialing;
+                    }
+                case "Ringing":
+                    {
+                        return eCodecCallStatus.Ringing;
+                    }
+                case "Connecting":
+                    {
+                        return eCodecCallStatus.Connecting;
+                    }
+                case "Connected":
+                    {
+                        return eCodecCallStatus.Connected;
+                    }
+                case "Disconnecting":
+                    {
+                        return eCodecCallStatus.Disconnecting;
+                    }
+                case "Incoming":
+                    {
+                        return eCodecCallStatus.Incoming;
+                    }
+                case "OnHold":
+                    {
+                        return eCodecCallStatus.OnHold;
+                    }
+                case "EarlyMedia":
+                    {
+                        return eCodecCallStatus.EarlyMedia;
+                    }
+                case "Preserved":
+                    {
+                        return eCodecCallStatus.Preserved;
+                    }
+                case "RemotePreserved":
+                    {
+                        return eCodecCallStatus.RemotePreserved;
+                    }
+                case "Disconnected":
+                    {
+                        return eCodecCallStatus.Disconnected;
+                    }
+                default:
+                    return eCodecCallStatus.Unknown;
+            }
+        }
+    }
+}

Essentials Devices Common/Essentials Devices Common/Codec/eCodecCallType.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
+
+{
+    public enum eCodecCallType
+    {
+        Unknown = 0, 
+        Audio, 
+        Video, 
+        AudioCanEscalate, 
+        ForwardAllCall
+    }
+
+    public class CodecCallType
+    {
+
+        /// <summary>
+        /// Takes the Cisco call type and converts to the matching enum
+        /// </summary>
+        /// <param name="s"></param>
+        /// <returns></returns>
+        public static eCodecCallType ConvertToTypeEnum(string s)
+        {
+            switch (s)
+            {
+                case "Audio":
+                    {
+                        return eCodecCallType.Audio;
+                    }
+                case "Video":
+                    {
+                        return eCodecCallType.Video;
+                    }
+                case "AudioCanEscalate":
+                    {
+                        return eCodecCallType.AudioCanEscalate;
+                    }
+                case "ForwardAllCall":
+                    {
+                        return eCodecCallType.ForwardAllCall;
+                    }
+                default:
+                    return eCodecCallType.Unknown;
+            }
+
+        }
+
+    }
+}

Essentials Devices Common/Essentials Devices Common/Codec/iHasCallHistory.cs

@@ -0,0 +1,184 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Devices.Common.Codec
+{
+    public interface IHasCallHistory
+    {
+        List<CallHistory.CallHistoryEntry> RecentCalls { get; }
+
+        void RemoveEntry(CallHistory.CallHistoryEntry entry);
+    }
+
+    public enum eCodecOccurrenctType
+    {
+        Unknown = 0,
+        Placed,
+        Received,
+        NoAnswer
+    }
+
+    public class CallHistory
+    {
+
+        /// <summary>
+        /// Generic call history entry, not device specific
+        /// </summary>
+        public class CallHistoryEntry
+        {
+            public string DisplayName { get; set; }
+            public string CallBackNumber { get; set; }
+            public DateTime StartTime { get; set; }
+            public eCodecOccurrenctType OccurenceType { get; set; }
+            public string OccurrenceHistoryId { get; set; }
+        }
+
+        /// <summary>
+        /// Converts a list of call history entries returned by a Cisco codec to the generic list type
+        /// </summary>
+        /// <param name="entries"></param>
+        /// <returns></returns>
+        public static List<CallHistoryEntry> ConvertCiscoCallHistoryToGeneric(List<CiscoCallHistory.Entry> entries)
+        {
+            var genericEntries = new List<CallHistoryEntry>();
+
+            foreach (CiscoCallHistory.Entry entry in entries)
+            {
+                genericEntries.Add(new CallHistoryEntry()
+                {
+                    DisplayName = entry.DisplayName.Value,
+                    CallBackNumber = entry.CallbackNumber.Value,
+                    StartTime = entry.LastOccurrenceStartTime.Value,
+                    OccurrenceHistoryId = entry.LastOccurrenceHistoryId.Value,
+                    OccurenceType = ConvertToOccurenceTypeEnum(entry.OccurrenceType.Value)          
+                });
+            }
+
+            return genericEntries;
+
+        }
+
+        /// <summary>
+        /// Takes the Cisco occurence type and converts it to the matching enum
+        /// </summary>
+        /// <param name="s"></para
+        public static eCodecOccurrenctType ConvertToOccurenceTypeEnum(string s)
+        {
+            switch (s)
+            {
+                case "Placed":
+                    {
+                        return eCodecOccurrenctType.Placed;
+                    }
+                case "Received":
+                    {
+                        return eCodecOccurrenctType.Received;
+                    }
+                case "NoAnswer":
+                    {
+                        return eCodecOccurrenctType.NoAnswer;
+                    }
+                default:
+                    return eCodecOccurrenctType.Unknown;
+            }
+
+        }
+
+    }
+
+
+
+
+    public class CiscoCallHistory
+    {
+
+        public class CallbackNumber
+        {
+            public string Value { get; set; }
+        }
+
+        public class DisplayName
+        {
+            public string Value { get; set; }
+        }
+
+        public class LastOccurrenceStartTime
+        {
+            public DateTime Value { get; set; }
+        }
+
+        public class LastOccurrenceDaysAgo
+        {
+            public string Value { get; set; }
+        }
+
+        public class LastOccurrenceHistoryId
+        {
+            public string Value { get; set; }
+        }
+
+        public class OccurrenceType
+        {
+            public string Value { get; set; }
+        }
+
+        public class IsAcknowledged
+        {
+            public string Value { get; set; }
+        }
+
+        public class OccurrenceCount
+        {
+            public string Value { get; set; }
+        }
+
+        public class Entry
+        {
+            public string id { get; set; }
+            public CallbackNumber CallbackNumber { get; set; }
+            public DisplayName DisplayName { get; set; }
+            public LastOccurrenceStartTime LastOccurrenceStartTime { get; set; }
+            public LastOccurrenceDaysAgo LastOccurrenceDaysAgo { get; set; }
+            public LastOccurrenceHistoryId LastOccurrenceHistoryId { get; set; }
+            public OccurrenceType OccurrenceType { get; set; }
+            public IsAcknowledged IsAcknowledged { get; set; }
+            public OccurrenceCount OccurrenceCount { get; set; }
+        }
+
+        public class Offset
+        {
+            public string Value { get; set; }
+        }
+
+        public class Limit
+        {
+            public string Value { get; set; }
+        }
+
+        public class ResultInfo
+        {
+            public Offset Offset { get; set; }
+            public Limit Limit { get; set; }
+        }
+
+        public class CallHistoryRecentsResult
+        {
+            public string status { get; set; }
+            public List<Entry> Entry { get; set; }
+            public ResultInfo ResultInfo { get; set; }
+        }
+
+        public class CommandResponse
+        {
+            public CallHistoryRecentsResult CallHistoryRecentsResult { get; set; }
+        }
+
+        public class RootObject
+        {
+            public CommandResponse CommandResponse { get; set; }
+        }
+    }
+}

Essentials Devices Common/Essentials Devices Common/Codec/iHasDialer.cs

@@ -25,4 +25,16 @@ namespace PepperDash.Essentials.Devices.Common.Codec
         IntFeedback ActiveCallCountFeedback { get; }
         BoolFeedback IncomingCallFeedback { get; }
     }
+
+
+    public interface IHasDirectory
+    {
+
+    }
+
+    public interface IHasObtp
+    {
+
+        // Upcoming Meeting warning event
+    }
 }

Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj

@@ -103,7 +103,11 @@
     <Reference Include="System.Data" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Codec\eCodecCallDirection.cs" />
+    <Compile Include="Codec\eCodecCallType.cs" />
+    <Compile Include="Codec\eCodecCallStatus.cs" />
     <Compile Include="Codec\iCodecAudio.cs" />
+    <Compile Include="Codec\iHasCallHistory.cs" />
     <Compile Include="Codec\iHasDialer.cs" />
     <Compile Include="Crestron\Gateways\CenRfgwController.cs" />
     <Compile Include="Display\ComTcpDisplayBase.cs" />

Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodec.cs

@@ -19,7 +19,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 {
     enum eCommandType { SessionStart, SessionEnd, Command, GetStatus, GetConfiguration };
 
-    public class CiscoCodec : VideoCodecBase
+    public class CiscoCodec : VideoCodecBase, IHasCallHistory
     {
         public IBasicCommunication Communication { get; private set; }
         public CommunicationGather PortGather { get; private set; }
@@ -31,7 +31,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
 
-        public BoolFeedback PeopleCountFeedback { get; private set; }
+        public IntFeedback PeopleCountFeedback { get; private set; }
 
         public BoolFeedback SpeakerTrackIsOnFeedback { get; private set; }
 
@@ -43,6 +43,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         private CiscoCodecStatus.RootObject CodecStatus;
 
+        private CiscoCallHistory.RootObject CodecCallHistory;
+
+        public List<CallHistory.CallHistoryEntry> RecentCalls { get; private set; }
+
         //private CiscoCodecEvents.RootObject CodecEvent;
 
         /// <summary>
@@ -72,11 +76,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             }
         }
 
+        /// <summary>
+        /// Gets the value of the currently shared source, or returns null
+        /// </summary>
         protected override Func<string> SharingSourceFeedbackFunc
         {
+#warning figure out how to return the key of the shared source somehow
             get 
             {
-                return () => "Todo";  
+                return () => "todo";
             }
         }
 
@@ -112,6 +120,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             }
         }
 
+        protected override Func<int> ActiveCallCountFeedbackFunc
+        {
+            get { return () => ActiveCalls.Count; }
+        }
+
         //private HttpsClient Client;
 
         //private HttpApiServer Server;
@@ -143,17 +156,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             : base(key, name)
         {
             StandbyIsOnFeedback = new BoolFeedback(StandbyStateFeedbackFunc);
+            RoomIsOccupiedFeedback = new BoolFeedback(RoomIsOccupiedFeedbackFunc);
+            PeopleCountFeedback = new IntFeedback(PeopleCountFeedbackFunc);
+            SpeakerTrackIsOnFeedback = new BoolFeedback(SpeakerTrackIsOnFeedbackFunc);
+
 
             Communication = comm;
 
             SyncState = new CodecSyncState(key + "--sync");
 
+            SyncState.InitialSyncCompleted += new EventHandler<EventArgs>(SyncState_InitialSyncCompleted);
+
             PortGather = new CommunicationGather(Communication, Delimiter);
             PortGather.IncludeDelimiter = true;
             PortGather.LineReceived += this.Port_LineReceived;
 
-            //ServerPort = serverPort;
-
             CodecObtp = new CiscoOneButtonToPush();
 
             PhoneBook = new Corporate_Phone_Book();
@@ -162,18 +179,39 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             CodecStatus = new CiscoCodecStatus.RootObject();
 
-            //CodecEvent = new CiscoCodecEvents.RootObject();
+            CodecCallHistory = new CiscoCallHistory.RootObject();
  
             CodecStatus.Status.Audio.Volume.ValueChangedAction = VolumeLevelFeedback.FireUpdate;
             CodecStatus.Status.Audio.VolumeMute.ValueChangedAction = MuteFeedback.FireUpdate;
             CodecStatus.Status.Audio.Microphones.Mute.ValueChangedAction = PrivacyModeIsOnFeedback.FireUpdate;
             CodecStatus.Status.Standby.State.ValueChangedAction = StandbyIsOnFeedback.FireUpdate;
+            CodecStatus.Status.RoomAnalytics.PeoplePresence.ValueChangedAction = RoomIsOccupiedFeedback.FireUpdate;
+            CodecStatus.Status.RoomAnalytics.PeopleCount.Current.ValueChangedAction = PeopleCountFeedback.FireUpdate;
+            CodecStatus.Status.Cameras.SpeakerTrack.Status.ValueChangedAction = SpeakerTrackIsOnFeedback.FireUpdate;
+
+            //ServerPort = serverPort;
 
             //Client = new HttpsClient();
 
             //Server = new HttpApiServer();      
         }
 
+        /// <summary>
+        /// Fires when initial codec sync is completed.  Used to then send commands to get call history, phonebook, bookings, etc.
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void SyncState_InitialSyncCompleted(object sender, EventArgs e)
+        {
+            SendText("xCommand CallHistory Recents Limit: 20 Order: OccurrenceTime");
+
+            // Get bookings for the day
+            //SendText("xCommand Bookings List Days: 1 DayOffset: 0");
+
+            // Get Phonebook (determine local/corporate from config, and set results limit)
+            //SendText("xCommand Phonebook Search PhonebookType: {0} ContactType: Folder Limit: {0}", PhonebookType, PhonebookResultsLimit);
+        }
+
         /// <summary>
         /// Starts the HTTP feedback server and syncronizes state of codec
         /// </summary>
@@ -230,6 +268,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 prefix + "/Configuration" + Delimiter +
                 prefix + "/Status/Audio" + Delimiter +
                 prefix + "/Status/Call" + Delimiter +
+                prefix + "/Status/Conference/Presentation" + Delimiter +
                 prefix + "/Status/Cameras/SpeakerTrack" + Delimiter +
                 prefix + "/Status/RoomAnalytics" + Delimiter +
                 prefix + "/Status/Standby" + Delimiter +
@@ -325,17 +364,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                         }
                     case "xpreferences outputmode json":
                         {
-                            if(!SyncState.InitialStatusMessageWasReceived)
+                            if (!SyncState.InitialStatusMessageWasReceived)
                                 SendText("xStatus");
                             break;
                         }
-                    case "xfeedback register":
+                    case "xfeedback register /event/calldisconnect":
                         {
                             SyncState.FeedbackRegistered();
                             break;
                         }
                 }
             }
+                
         }
 
         public void SendText(string command)
@@ -519,6 +559,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
                 if (response.IndexOf("\"Status\":{") > -1)
                 {
+                    // Status Message
+
                     // Check to see if this is a call status message received after the initial status message
                     if(SyncState.InitialStatusMessageWasReceived && response.IndexOf("\"Call\":{") > -1)
                     {
@@ -537,14 +579,37 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                                 // If an existing call object is found with a matching ID, populate the existing call with the new data. 
                                 // (must reserialize the object so that we can use PopulateObject() to overlay the new or updated properties on the existing object)
                                 JsonConvert.PopulateObject(JsonConvert.SerializeObject(call), existingCall);
+
+                                var tempActiveCall = ActiveCalls.FirstOrDefault(c => c.Id.Equals(call.id));
+
+                                // store previous status to pass to event handler
+                                var previousStatus = tempActiveCall.Status; 
+
+                                // Update properties of ActiveCallItem
+                                tempActiveCall.Status = CodecCallStatus.ConvertToStatusEnum(call.Status.Value);
+                                tempActiveCall.Type = CodecCallType.ConvertToTypeEnum(call.CallType.Value);
+                                tempActiveCall.Name = call.DisplayName.Value;
+
+                                SetNewCallStatusAndFireCallStatusChange(previousStatus, tempActiveCall);
                             }
                             else
                             {
                                 // Add the call
                                 callStatus.Status.Call.Add(call);
 
+                                var newCallItem = new CodecActiveCallItem() 
+                                { 
+                                    Id = call.id, 
+                                    Status = CodecCallStatus.ConvertToStatusEnum(call.Status.Value), 
+                                    Name = call.DisplayName.Value, 
+                                    Number = call.RemoteNumber.Value,
+                                    Type = CodecCallType.ConvertToTypeEnum(call.CallType.Value) 
+                                };
+
                                 // Add a call to the ActiveCalls List
-                                //ActiveCalls.Add(new CodecActiveCallItem() { Id = call.id, Status = call.Status.Value, Name = call.DisplayName.Value, Number = call.RemoteNumber.Value, Type = call.Status.Value.ToString()
+                                ActiveCalls.Add(newCallItem);
+
+                                SetNewCallStatusAndFireCallStatusChange(newCallItem.Status, newCallItem);
                             }
 
                             // Handle call.status to determine if we need to fire an event notifying of an incoming call or a call disconnect
@@ -562,6 +627,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 }
                 else if (response.IndexOf("\"Configuration\":{") > -1)
                 {
+                    // Configuration Message
+
                     JsonConvert.PopulateObject(response, CodecConfiguration);
 
                     if (!SyncState.InitialConfigurationMessageWasReceived)
@@ -576,12 +643,37 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 }
                 else if (response.IndexOf("\"Event\":{") > -1)
                 {
+                    // Event Message
+
                     CiscoCodecEvents.RootObject eventReceived = new CiscoCodecEvents.RootObject();
 
                     JsonConvert.PopulateObject(response, eventReceived);
 
                     EvalutateEvent(eventReceived);
                 }
+                else if (response.IndexOf("\"CommandResponse\":{") > -1)
+                {
+                    // CommandResponse Message
+
+                    if (response.IndexOf("\"CallHistoryRecentsResult\":{") > -1)
+                    {
+                        JsonConvert.PopulateObject(response, CodecCallHistory);
+
+                        RecentCalls = CallHistory.ConvertCiscoCallHistoryToGeneric(CodecCallHistory.CommandResponse.CallHistoryRecentsResult.Entry);
+
+                        if (Debug.Level == 1)
+                        {
+                            
+                            Debug.Console(1, this, "RecentCalls:\n");
+
+                            foreach (CallHistory.CallHistoryEntry entry in RecentCalls)
+                            {
+                                Debug.Console(1, this, "\nName: {0}\nNumber{1}\nStartTime{2}\nType{3}\n", entry.DisplayName, entry.CallBackNumber, entry.StartTime.ToString(), entry.OccurenceType);
+                            }
+                        }
+                    }
+
+                }
                 
             }
             catch (Exception ex)
@@ -590,6 +682,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             }
         }
 
+
         /// <summary>
         /// Evaluates an event received from the codec
         /// </summary>
@@ -598,12 +691,21 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         {
             if (eventReceived.Event.CallDisconnect != null)
             {
-                var tempCall = CodecStatus.Status.Call.FirstOrDefault(c => c.id.Equals(eventReceived.Event.CallDisconnect.CallId));
+                var tempCall = CodecStatus.Status.Call.FirstOrDefault(c => c.id.Equals(eventReceived.Event.CallDisconnect.CallId.Value));
 
                 if(tempCall != null)
                 {
+                    // Remove the call from the xStatus object
                     CodecStatus.Status.Call.Remove(tempCall);
 
+                    var tempActiveCall = ActiveCalls.FirstOrDefault(c => c.Id.Equals(eventReceived.Event.CallDisconnect.CallId.Value));
+
+                    // Remove the call from the Active calls list
+                    if (tempActiveCall != null)
+                        ActiveCalls.Remove(tempActiveCall);
+
+                    // Notify of the call disconnection
+                    SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Disconnected, tempActiveCall);
                 }
             }
         }
@@ -800,10 +902,15 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SendText("xCommand SystemUnit Boot Action: Restart");
         }
 
-        protected override Func<int> ActiveCallCountFeedbackFunc
+        public void RemoveEntry(CallHistory.CallHistoryEntry entry)
         {
-            get { return () => 0; }
+            if (RecentCalls != null)
+            {
+                RecentCalls.Remove(entry);
+            }
         }
+
+
     }
 
     /// <summary>
@@ -811,9 +918,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
     /// </summary>
     public class CodecSyncState : IKeyed
     {
+        bool _InitialSyncComplete;
+
+        public event EventHandler<EventArgs> InitialSyncCompleted;
+
         public string Key { get; private set; }
 
-        public bool InitialSyncComplete { get; private set; }
+        public bool InitialSyncComplete 
+        {
+            get { return _InitialSyncComplete; }
+            private set
+            {
+                if (value == true)
+                {
+                    var handler = InitialSyncCompleted;
+                    if (handler != null)
+                        handler(this, new EventArgs());
+                }
+                _InitialSyncComplete = value;
+            }
+        }
 
         public bool InitialStatusMessageWasReceived { get; private set; }
 

Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoCodec.cs.orig

@@ -13,6 +13,7 @@ using Cisco_SX80_Corporate_Phone_Book;
 using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Routing;
+using PepperDash.Essentials.Devices.Common.Codec;
 
 namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 {
@@ -28,6 +29,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public BoolFeedback StandbyIsOnFeedback { get; private set; }
 
+        public BoolFeedback RoomIsOccupiedFeedback { get; private set; }
+
+        public BoolFeedback PeopleCountFeedback { get; private set; }
+
+        public BoolFeedback SpeakerTrackIsOnFeedback { get; private set; }
+
         private CiscoOneButtonToPush CodecObtp;
 
         private Corporate_Phone_Book PhoneBook;
@@ -36,7 +43,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         private CiscoCodecStatus.RootObject CodecStatus;
 
+<<<<<<< HEAD
         private CiscoCodecEvents.RootObject CodecEvent;
+=======
+        //private CiscoCodecEvents.RootObject CodecEvent;
+>>>>>>> origin/feature/cisco-spark-2
 
         /// <summary>
         /// Gets and returns the scaled volume of the codec
@@ -67,12 +78,42 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         protected override Func<string> SharingSourceFeedbackFunc
         {
-            get { return () => "Fix me fuckers";  }
+            get 
+            { 
+                return () => "Todo";  
+            }
         }
 
         protected override Func<bool> MuteFeedbackFunc
         {
-            get { return () => false; }
+            get 
+            { 
+                return () => CodecStatus.Status.Audio.VolumeMute.BoolValue; 
+            }
+        }
+
+        protected Func<bool> RoomIsOccupiedFeedbackFunc
+        {
+            get
+            {
+                return () => CodecStatus.Status.RoomAnalytics.PeoplePresence.BoolValue;
+            }
+        }
+
+        protected Func<int> PeopleCountFeedbackFunc
+        {
+            get
+            {
+                return () => CodecStatus.Status.RoomAnalytics.PeopleCount.Current.IntValue;
+            }
+        }
+
+        protected Func<bool> SpeakerTrackIsOnFeedbackFunc
+        {
+            get
+            {
+                return () => CodecStatus.Status.Cameras.SpeakerTrack.Status.BoolValue;
+            }
         }
 
         //private HttpsClient Client;
@@ -125,7 +166,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
             CodecStatus = new CiscoCodecStatus.RootObject();
 
-            CodecEvent = new CiscoCodecEvents.RootObject();
+            //CodecEvent = new CiscoCodecEvents.RootObject();
 
             CodecStatus.Status.Audio.Volume.ValueChangedAction = VolumeLevelFeedback.FireUpdate;
             CodecStatus.Status.Audio.VolumeMute.ValueChangedAction = MuteFeedback.FireUpdate;
@@ -482,6 +523,38 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
                 if (response.IndexOf("\"Status\":{") > -1)
                 {
+                    // Check to see if this is a call status message received after the initial status message
+                    if(SyncState.InitialStatusMessageWasReceived && response.IndexOf("\"Call\":{") > -1)
+                    {
+                        CiscoCodecStatus.RootObject callStatus = new CiscoCodecStatus.RootObject();
+
+                        JsonConvert.PopulateObject(response, callStatus);
+
+                        // Iterate through the call objects in the response
+                        foreach (CiscoCodecStatus.Call call in callStatus.Status.Call)
+                        {
+                            // Look for a matching call id in the existing status structure
+                            var existingCall = CodecStatus.Status.Call.FirstOrDefault(c => c.id.Equals(call.id));
+
+                            if (existingCall != null)
+                            {
+                                // If an existing call object is found with a matching ID, populate the existing call with the new data. 
+                                // (must reserialize the object so that we can use PopulateObject() to overlay the new or updated properties on the existing object)
+                                JsonConvert.PopulateObject(JsonConvert.SerializeObject(call), existingCall);
+                            }
+                            else
+                            {
+                                // Add the call
+                                callStatus.Status.Call.Add(call);
+
+                                // Add a call to the ActiveCalls List
+                                //ActiveCalls.Add(new CodecActiveCallItem() { Id = call.id, Status = call.Status.Value, Name = call.DisplayName.Value, Number = call.RemoteNumber.Value, Type = call.Status.Value.ToString()
+                            }
+
+                            // Handle call.status to determine if we need to fire an event notifying of an incoming call or a call disconnect
+                        }
+                    }
+
                     JsonConvert.PopulateObject(response, CodecStatus);
 
                     if (!SyncState.InitialStatusMessageWasReceived)
@@ -507,7 +580,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 }
                 else if (response.IndexOf("\"Event\":{") > -1)
                 {
-                    JsonConvert.PopulateObject(response, CodecEvent);
+                    CiscoCodecEvents.RootObject eventReceived = new CiscoCodecEvents.RootObject();
+
+                    JsonConvert.PopulateObject(response, eventReceived);
+
+                    EvalutateEvent(eventReceived);
                 }
                 
             }
@@ -517,6 +594,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             }
         }
 
+        /// <summary>
+        /// Evaluates an event received from the codec
+        /// </summary>
+        /// <param name="eventReceived"></param>
+        void EvalutateEvent(CiscoCodecEvents.RootObject eventReceived)
+        {
+            if (eventReceived.Event.CallDisconnect != null)
+            {
+                var tempCall = CodecStatus.Status.Call.FirstOrDefault(c => c.id.Equals(eventReceived.Event.CallDisconnect.CallId));
+
+                if(tempCall != null)
+                {
+                    CodecStatus.Status.Call.Remove(tempCall);
+                    
+                }
+            }
+        }
+
         public override void ExecuteSwitch(object selector)
         {
             (selector as Action)();
@@ -551,11 +646,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             SendText(string.Format("xCommand Dial BookingId: {0}", s));
         }
  
-<<<<<<< HEAD
-        public override void EndCall(string s)
-        {
-            SendText(string.Format("xCommand Call Disconnect CallId: {0}", GetCallId()));
-=======
         public override void EndCall(CodecActiveCallItem activeCall)
         {
             SendText(string.Format("xCommand Call Disconnect CallId: {0}", activeCall.Id));
@@ -567,15 +657,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             {
                 SendText(string.Format("xCommand Call Disconnect CallId: {0}", activeCall.Id));
             }
->>>>>>> origin/feature/cisco-spark-2
         }
 
-        public override void AcceptCall()
+        public override void AcceptCall(CodecActiveCallItem item)
         {
             SendText("xCommand Call Accept");
         }
 
-        public override void RejectCall()
+        public override void RejectCall(CodecActiveCallItem item)
         {
             SendText("xCommand Call Reject");
         }

Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs

@@ -65,6 +65,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
         public class Microphones
         {
             public Mute Mute { get; set; }
+
+            public Microphones()
+            {
+                Mute = new Mute();
+            }
         }
 
         public class ConnectionStatus2
@@ -155,6 +160,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Audio()
             {
                 Volume = new Volume();
+                VolumeMute = new VolumeMute();
+                Microphones = new Microphones();
             }
         }
 
@@ -243,13 +250,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
 
         public class Status2 : ValueProperty
         {
+            string _Value;
             public bool BoolValue { get; private set; }
 
             public string Value
             {
+                get
+                {
+                    return _Value;
+                }
                 set
                 {
                     // If the incoming value is "Active" it sets the BoolValue true, otherwise sets it false
+                    _Value = value;
                     BoolValue = value == "Active";
                     OnValueChanged();
                 }
@@ -342,9 +355,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public string Value { get; set; }
         }
 
-        public class Mode2
+        public class Mode2 : ValueProperty
         {
-            public string Value { get; set; }
+            public bool BoolValue { get; private set; }
+
+            public string Value
+            {
+                set
+                {
+                    // If the incoming value is "Active" it sets the BoolValue true, otherwise sets it false
+                    BoolValue = value == "On";
+                    OnValueChanged();
+                }
+            }
         }
 
         public class Mode3
@@ -374,6 +397,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public CallId2 CallId { get; set; }
             public Mode2 Mode { get; set; }
             public Whiteboard Whiteboard { get; set; }
+
+            public Presentation()
+            {
+                Mode = new Mode2();
+            }
         }
 
         public class CallId3
@@ -399,6 +427,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public Multipoint Multipoint { get; set; }
             public Presentation Presentation { get; set; }
             public SpeakerLock SpeakerLock { get; set; }
+
+            public Conference2()
+            {
+                Presentation = new Presentation();
+            }
         }
 
         public class Description
@@ -1656,6 +1689,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
             public RemoteNumber RemoteNumber { get; set; }
             public Status2 Status { get; set; }
             public TransmitCallRate TransmitCallRate { get; set; }
+
+            public Call()
+            {
+                CallType = new CallType();
+                Status = new Status2();
+            }
         }
 
         public class Status
@@ -1692,8 +1731,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
                 Standby = new Standby();
                 Cameras = new Cameras();
                 RoomAnalytics = new RoomAnalytics();
+                Conference = new Conference2();
             }
-#warning Figure out how to flag codec as InCall if Call.Count > 0
         }
 
         public class RootObject

Essentials Devices Common/Essentials Devices Common/VideoCodec/MockVC/MockVC.cs

@@ -66,30 +66,28 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         public override void Dial(string s)
         {
             Debug.Console(1, this, "Dial: {0}", s);
-            var item = new CodecActiveCallItem() { Name = s, Number = s, Id = s, Status = eCodecCallStatus.Dialing };
+            var call = new CodecActiveCallItem() { Name = s, Number = s, Id = s, Status = eCodecCallStatus.Dialing };
-            ActiveCalls.Add(item);
+            ActiveCalls.Add(call);
-            OnCallStatusChange(eCodecCallStatus.Unknown, item.Status, item);
+            OnCallStatusChange(eCodecCallStatus.Unknown, call.Status, call);
             ActiveCallCountFeedback.FireUpdate();
-            // Simulate 2-second ring
+            // Simulate 2-second ring, then connecting, then connected
             new CTimer(o =>
             {
-                var prevStatus = item.Status;
+                call.Type = eCodecCallType.Video;
-                item.Status = eCodecCallStatus.Connected;
+                SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Connecting, call);
-                item.Type = eCodecCallType.Video;
+                new CTimer(oo => SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Connected, call), 1000);
-                OnCallStatusChange(prevStatus, item.Status, item);
             }, 2000);
         }
 
         /// <summary>
         /// 
         /// </summary>
-        public override void EndCall(CodecActiveCallItem activeCall)
+        public override void EndCall(CodecActiveCallItem call)
         {
             Debug.Console(1, this, "EndCall");
-            ActiveCalls.Remove(activeCall);
+            ActiveCalls.Remove(call);
-            var prevStatus = activeCall.Status;
+
-            activeCall.Status = eCodecCallStatus.Disconnected;
+            SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Disconnected, call);
-            OnCallStatusChange(prevStatus, activeCall.Status, activeCall);
             ActiveCallCountFeedback.FireUpdate();
         }
 
@@ -99,23 +97,29 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         public override void EndAllCalls()
         {
             Debug.Console(1, this, "EndAllCalls");
-            ActiveCalls.Clear();
+            foreach (var call in ActiveCalls)
+            {
+                ActiveCalls.Remove(call);
+                SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Disconnected, call);
+            }
             ActiveCallCountFeedback.FireUpdate();
         }
 
         /// <summary>
         /// For a call from the test methods below
         /// </summary>
-        public override void AcceptCall(CodecActiveCallItem item)
+        public override void AcceptCall(CodecActiveCallItem call)
         {
             Debug.Console(1, this, "AcceptCall");
-            
+            SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Connecting, call);
+            new CTimer(o => SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Connected, call), 1000);
+            // should already be in active list
         }
 
         /// <summary>
         /// For a call from the test methods below
         /// </summary>
-        public override void RejectCall(CodecActiveCallItem item)
+        public override void RejectCall(CodecActiveCallItem call)
         {
             Debug.Console(1, this, "RejectCall");
         }
@@ -247,14 +251,30 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         /// 
         /// </summary>
         /// <param name="url"></param>
-        public void TestIncomingCall(string url)
+        public void TestIncomingVideoCall(string url)
         {
-            Debug.Console(1, this, "TestIncomingCall from {0}", url);
+            Debug.Console(1, this, "TestIncomingVideoCall from {0}", url);
-            var item = new CodecActiveCallItem() { Name = url, Id = url, Number = url, Status = eCodecCallStatus.Incoming, Type= eCodecCallType.Unknown };
+            var call = new CodecActiveCallItem() { Name = url, Id = url, Number = url, Type= eCodecCallType.Video };
-            ActiveCalls.Add(item);
+            ActiveCalls.Add(call);
+            SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Incoming, call);
             _IncomingCall = true;
             IncomingCallFeedback.FireUpdate();
+            ActiveCallCountFeedback.FireUpdate();
+        }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="url"></param>
+        public void TestIncomingAudioCall(string url)
+        {
+            Debug.Console(1, this, "TestIncomingAudioCall from {0}", url);
+            var call = new CodecActiveCallItem() { Name = url, Id = url, Number = url, Type = eCodecCallType.Audio };
+            ActiveCalls.Add(call);
+            SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Incoming, call);
+            _IncomingCall = true;
+            IncomingCallFeedback.FireUpdate();
+            ActiveCallCountFeedback.FireUpdate();
         }
         
         /// <summary>
@@ -266,6 +286,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
         public void ListCalls()
         {
             var sb = new StringBuilder();
@@ -278,7 +301,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 
         public RoutingPortCollection<RoutingOutputPort> OutputPorts
         {
-            get { throw new NotImplementedException(); }
+            get { return new RoutingPortCollection<RoutingOutputPort>(); }
         }
 
         #endregion

Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs

@@ -35,9 +35,18 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         #endregion
 
         /// <summary>
-        /// Returns true when ActiveCallCountFeedback is > 0
+        /// Returns whether any call in ActiveCalls is actually "active"
         /// </summary>
-        public bool IsInCall { get { return ActiveCallCountFeedback.IntValue > 0; } }
+        public bool IsInCall
+        {
+            get
+            {
+                return ActiveCalls.Any(c =>
+                    !(c.Status == eCodecCallStatus.Unknown
+                    || c.Status == eCodecCallStatus.Disconnected
+                    || c.Status == eCodecCallStatus.Disconnecting));
+            }
+        }
 
         public BoolFeedback IncomingCallFeedback { get; private set; }
 
@@ -87,11 +96,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         #region IHasDialer Members
 
         public abstract void Dial(string s);
-        public void EndCall(object activeCall)
+        public abstract void EndCall(CodecActiveCallItem call);
-        {
-
-        }
-        public abstract void EndCall(CodecActiveCallItem activeCall);
         public abstract void EndAllCalls();
         public abstract void AcceptCall(CodecActiveCallItem call);
         public abstract void RejectCall(CodecActiveCallItem call);
@@ -115,13 +120,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
         public abstract void ExecuteSwitch(object selector);
 
         /// <summary>
-        /// 
+        /// Helper method to fire CallStatusChange event with old and new status
+        /// </summary>
+        protected void SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus newStatus, CodecActiveCallItem call)
+        {
+            var prevStatus = call.Status;
+            call.Status = newStatus;
+            OnCallStatusChange(prevStatus, newStatus, call);
+        }
+
+        /// <summary>
+        /// Helper method to notify of call status change event
         /// </summary>
         /// <param name="previousStatus"></param>
         /// <param name="newStatus"></param>
         /// <param name="item"></param>
         protected void OnCallStatusChange(eCodecCallStatus previousStatus, eCodecCallStatus newStatus, CodecActiveCallItem item)
         {
+            Debug.Console(1, this, "Call Status Changed from {0} to {1} on call {2}", previousStatus, newStatus, item.Id);
             var handler = CallStatusChange;
             if (handler != null)
                 handler(this, new CodecCallStatusItemChangeEventArgs(previousStatus, newStatus, item));

Essentials/PepperDashEssentials/ControlSystem.cs

@@ -31,7 +31,7 @@ namespace PepperDash.Essentials
 		{
             //CrestronConsole.AddNewConsoleCommand(s => GoWithLoad(), "go", "Reloads configuration file",
             //    ConsoleAccessLevelEnum.AccessOperator);
-            //CrestronConsole.AddNewConsoleCommand(s => TearDown(), "ungo", "Reloads configuration file",
+            //CrestronConsole.AddNewConsoleCommand(s => TearDown(), "ungo", "Unloads configuration file",
             //    ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(s =>
             {