cleaned out framework files; added framework submodule; referneced p.core to reference in framework; moved essentials.sln; changed paths in sln to match; test build

PepperDashEssentials/Room/Config/DDVC01RoomPropertiesConfig.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Room.Config
+{
+	public class DDVC01RoomPropertiesConfig : EssentialsHuddleVtc1PropertiesConfig
+	{
+		[JsonProperty("roomPhoneNumber")]
+		public string RoomPhoneNumber { get; set; }
+		[JsonProperty("roomURI")]
+		public string RoomURI { get; set; }
+		[JsonProperty("speedDials")]
+		public List<DDVC01SpeedDial> SpeedDials { get; set; }
+		[JsonProperty("volumeSliderNames")]
+		public List<string> VolumeSliderNames { get; set; }
+	}
+
+	public class DDVC01SpeedDial
+	{
+		[JsonProperty("name")]
+		public string Name { get; set; }
+		[JsonProperty("number")]
+		public string Number { get; set; }
+	}
+}

PepperDashEssentials/Room/Config/EssentialsHuddleRoomPropertiesConfig.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Room.Config
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EssentialsHuddleRoomPropertiesConfig : EssentialsRoomPropertiesConfig
+    {
+        public string DefaultDisplayKey { get; set; }
+        public string DefaultAudioKey { get; set; }
+        public string SourceListKey { get; set; }
+        public string DefaultSourceItem { get; set; }
+    }
+}

PepperDashEssentials/Room/Config/EssentialsHuddleVtc1PropertiesConfig.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Room.Config
+{
+
+    public class EssentialsHuddleVtc1PropertiesConfig : EssentialsRoomPropertiesConfig
+    {
+		[JsonProperty("defaultDisplayKey")]
+		public string DefaultDisplayKey { get; set; }
+		[JsonProperty("defaultAudioKey")]
+		public string DefaultAudioKey { get; set; }
+		[JsonProperty("sourceListKey")]
+		public string SourceListKey { get; set; }
+		[JsonProperty("defaultSourceItem")]
+		public string DefaultSourceItem { get; set; }
+		[JsonProperty("videoCodecKey")]
+		public string VideoCodecKey { get; set; }
+    }
+}

PepperDashEssentials/Room/Config/EssentialsPresentationPropertiesConfig.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Room.Config
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EssentialsPresentationRoomPropertiesConfig : EssentialsRoomPropertiesConfig
+    {
+        public string DefaultAudioBehavior { get; set; }
+        public string DefaultAudioKey { get; set; }
+        public string DefaultVideoBehavior { get; set; }
+        public List<string> DisplayKeys { get; set; }
+        public string SourceListKey { get; set; }
+        public bool HasDsp { get; set; }
+
+        public EssentialsPresentationRoomPropertiesConfig()
+        {
+            DisplayKeys = new List<string>();
+        }
+    }
+}

PepperDashEssentials/Room/Config/EssentialsRoomConfig.cs

@@ -0,0 +1,334 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using Crestron.SimplSharp;
+using Newtonsoft.Json;
+
+using PepperDash.Core;
+using PepperDash.Essentials;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Config;
+
+namespace PepperDash.Essentials.Room.Config
+{
+	public class EssentialsRoomConfig : DeviceConfig
+	{
+		/// <summary>
+		/// Returns a room object from this config data
+		/// </summary>
+		/// <returns></returns>
+		public Device GetRoomObject()
+		{
+			var typeName = Type.ToLower();
+			if (typeName == "huddle")
+			{
+                var props = JsonConvert.DeserializeObject<EssentialsHuddleRoomPropertiesConfig>
+                    (this.Properties.ToString());
+				var disp = DeviceManager.GetDeviceForKey(props.DefaultDisplayKey) as IRoutingSinkWithSwitching;
+				var audio = DeviceManager.GetDeviceForKey(props.DefaultAudioKey) as IRoutingSinkNoSwitching;
+				var huddle = new EssentialsHuddleSpaceRoom(Key, Name, disp, audio, props);
+
+                if (props.Occupancy != null)
+                    huddle.SetRoomOccupancy(DeviceManager.GetDeviceForKey(props.Occupancy.DeviceKey) as
+                        PepperDash.Essentials.Devices.Common.Occupancy.IOccupancyStatusProvider, props.Occupancy.TimoutMinutes);
+                huddle.LogoUrl = props.Logo.GetUrl();
+                huddle.SourceListKey = props.SourceListKey;
+                huddle.DefaultSourceItem = props.DefaultSourceItem;
+                huddle.DefaultVolume = (ushort)(props.Volumes.Master.Level * 65535 / 100);
+                return huddle;
+			}
+			else if (typeName == "presentation")
+			{
+                var props = JsonConvert.DeserializeObject<EssentialsPresentationRoomPropertiesConfig>
+                    (this.Properties.ToString());
+                var displaysDict = new Dictionary<uint, IRoutingSinkNoSwitching>();
+                uint i = 1;
+                foreach (var dispKey in props.DisplayKeys) // read in the ordered displays list
+                {
+                    var disp = DeviceManager.GetDeviceForKey(dispKey) as IRoutingSinkWithSwitching;
+                    displaysDict.Add(i++, disp);
+                }
+
+                // Get the master volume control
+                IBasicVolumeWithFeedback masterVolumeControlDev = props.Volumes.Master.GetDevice();
+
+                
+                var presRoom = new EssentialsPresentationRoom(Key, Name, displaysDict, masterVolumeControlDev, props);
+                return presRoom;
+            }
+            else if (typeName == "huddlevtc1")
+            {
+                var props = JsonConvert.DeserializeObject<EssentialsHuddleVtc1PropertiesConfig>
+                    (this.Properties.ToString());
+                var disp = DeviceManager.GetDeviceForKey(props.DefaultDisplayKey) as IRoutingSinkWithSwitching;
+
+                var codec = DeviceManager.GetDeviceForKey(props.VideoCodecKey) as
+                    PepperDash.Essentials.Devices.Common.VideoCodec.VideoCodecBase;
+
+                var rm = new EssentialsHuddleVtc1Room(Key, Name, disp, codec, codec, props);
+                // Add Occupancy object from config
+
+                if (props.Occupancy != null)
+                    rm.SetRoomOccupancy(DeviceManager.GetDeviceForKey(props.Occupancy.DeviceKey) as
+                        PepperDash.Essentials.Devices.Common.Occupancy.IOccupancyStatusProvider, props.Occupancy.TimoutMinutes);
+                rm.LogoUrl = props.Logo.GetUrl();
+                rm.SourceListKey = props.SourceListKey;
+                rm.DefaultSourceItem = props.DefaultSourceItem;
+                rm.DefaultVolume = (ushort)(props.Volumes.Master.Level * 65535 / 100);
+
+                rm.MicrophonePrivacy = GetMicrophonePrivacy(props, rm); // Get Microphone Privacy object, if any
+
+                rm.Emergency = GetEmergency(props, rm); // Get emergency object, if any
+
+                return rm;
+            }
+			else if (typeName == "ddvc01Bridge")
+			{
+				return new Device(Key, Name); // placeholder device that does nothing.
+			}
+
+            return null;
+		}
+
+        /// <summary>
+        /// Gets and operating, standalone emergegncy object that can be plugged into a room.
+        /// Returns null if there is no emergency defined
+        /// </summary>
+        EssentialsRoomEmergencyBase GetEmergency(EssentialsRoomPropertiesConfig props, EssentialsRoomBase room)
+        {
+            // This emergency 
+            var emergency = props.Emergency;
+            if (emergency != null)
+            {
+                //switch on emergency type here.  Right now only contact and shutdown
+                var e = new EssentialsRoomEmergencyContactClosure(room.Key + "-emergency", props.Emergency, room);
+                DeviceManager.AddDevice(e);
+            }
+            return null;
+        }
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <param name="props"></param>
+		/// <param name="room"></param>
+		/// <returns></returns>
+		PepperDash.Essentials.Devices.Common.Microphones.MicrophonePrivacyController GetMicrophonePrivacy(
+			EssentialsRoomPropertiesConfig props, EssentialsHuddleVtc1Room room)
+		{
+			var microphonePrivacy = props.MicrophonePrivacy;
+			if (microphonePrivacy == null)
+			{
+				Debug.Console(0, "ERROR: Cannot create microphone privacy with null properties");
+				return null;
+			}
+			// Get the MicrophonePrivacy device from the device manager
+			var mP = (DeviceManager.GetDeviceForKey(props.MicrophonePrivacy.DeviceKey) as
+				PepperDash.Essentials.Devices.Common.Microphones.MicrophonePrivacyController);
+			// Set this room as the IPrivacy device
+			if (mP == null)
+			{
+				Debug.Console(0, "ERROR: Selected device {0} is not MicrophonePrivacyController", props.MicrophonePrivacy.DeviceKey);
+				return null;
+			}
+			mP.SetPrivacyDevice(room);
+
+			var behaviour = props.MicrophonePrivacy.Behaviour.ToLower();
+
+			if (behaviour == null)
+			{
+				Debug.Console(0, "WARNING: No behaviour defined for MicrophonePrivacyController");
+				return null;
+			}
+			if (behaviour == "trackroomstate")
+			{
+				// Tie LED enable to room power state
+				room.OnFeedback.OutputChange += (o, a) =>
+				{
+					if (room.OnFeedback.BoolValue)
+						mP.EnableLeds = true;
+					else
+						mP.EnableLeds = false;
+				};
+
+				mP.EnableLeds = room.OnFeedback.BoolValue;
+			}
+			else if (behaviour == "trackcallstate")
+			{
+				// Tie LED enable to room power state
+				room.InCallFeedback.OutputChange += (o, a) =>
+				{
+					if (room.InCallFeedback.BoolValue)
+						mP.EnableLeds = true;
+					else
+						mP.EnableLeds = false;
+				};
+
+				mP.EnableLeds = room.InCallFeedback.BoolValue;
+			}
+
+			return mP;
+		}
+	
+	}
+
+    /// <summary>
+    /// 
+    /// </summary>
+	public class EssentialsRoomPropertiesConfig
+	{
+		[JsonProperty("addresses")]
+		public EssentialsRoomAddressPropertiesConfig Addresses { get; set; }
+
+		[JsonProperty("description")]
+		public string Description { get; set; }
+
+		[JsonProperty("emergency")]
+		public EssentialsRoomEmergencyConfig Emergency { get; set; }
+
+		[JsonProperty("help")]
+		public EssentialsHelpPropertiesConfig Help { get; set; }
+
+		[JsonProperty("helpMessage")]
+		public string HelpMessage { get; set; }
+
+		[JsonProperty("environment")]
+		public EssentialsEnvironmentPropertiesConfig Environment { get; set; }
+
+		[JsonProperty("logo")]
+		public EssentialsLogoPropertiesConfig Logo { get; set; }
+	
+		[JsonProperty("microphonePrivacy")]
+		public EssentialsRoomMicrophonePrivacyConfig MicrophonePrivacy { get; set; }
+
+		[JsonProperty("occupancy")]
+		public EssentialsRoomOccSensorConfig Occupancy { get; set; }
+
+		[JsonProperty("oneButtonMeeting")]
+		public EssentialsOneButtonMeetingPropertiesConfig OneButtonMeeting { get; set; }
+
+		[JsonProperty("shutdownVacancySeconds")]
+		public int ShutdownVacancySeconds { get; set; }
+
+		[JsonProperty("shutdownPromptSeconds")]
+		public int ShutdownPromptSeconds { get; set; }
+
+		[JsonProperty("tech")]
+		public EssentialsRoomTechConfig Tech { get; set; }
+
+		[JsonProperty("volumes")]
+		public EssentialsRoomVolumesConfig Volumes { get; set; }
+
+		[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
+		public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
+	}
+
+	public class EssentialsEnvironmentPropertiesConfig
+	{
+		public bool Enabled { get; set; }
+
+        [JsonProperty("deviceKeys")]
+        public List<string> DeviceKeys { get; set; }
+
+        public EssentialsEnvironmentPropertiesConfig()
+        {
+            DeviceKeys = new List<string>();
+        }
+
+	}
+
+    public class EssentialsRoomMicrophonePrivacyConfig
+    {
+		[JsonProperty("deviceKey")]
+		public string DeviceKey { get; set; }
+
+		[JsonProperty("behaviour")]
+		public string Behaviour { get; set; }
+    }
+
+    /// <summary>
+    /// Properties for the help text box
+    /// </summary>
+    public class EssentialsHelpPropertiesConfig
+    {
+		[JsonProperty("message")]
+		public string Message { get; set; }
+
+		[JsonProperty("showCallButton")]
+		public bool ShowCallButton { get; set; }
+        
+		/// <summary>
+        /// Defaults to "Call Help Desk"
+        /// </summary>
+		[JsonProperty("callButtonText")]
+		public string CallButtonText { get; set; }
+
+        public EssentialsHelpPropertiesConfig()
+        {
+            CallButtonText = "Call Help Desk";
+        }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EssentialsOneButtonMeetingPropertiesConfig
+    {
+		[JsonProperty("enable")]
+		public bool Enable { get; set; }
+    }
+
+    public class EssentialsRoomAddressPropertiesConfig
+    {
+		[JsonProperty("phoneNumber")]
+		public string PhoneNumber { get; set; }
+
+		[JsonProperty("sipAddress")]
+		public string SipAddress { get; set; }
+    }
+
+
+    /// <summary>
+    /// Properties for the room's logo on panels
+    /// </summary>
+    public class EssentialsLogoPropertiesConfig
+    {
+		[JsonProperty("type")]
+		public string Type { get; set; }
+
+		[JsonProperty("url")]
+		public string Url { get; set; }
+        /// <summary>
+        /// Gets either the custom URL, a local-to-processor URL, or null if it's a default logo
+        /// </summary>
+        public string GetUrl()
+        {
+            if (Type == "url")
+                return Url;
+            if (Type == "system")
+                return string.Format("http://{0}:8080/logo.png", 
+                    CrestronEthernetHelper.GetEthernetParameter(CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0));
+            return null;
+        }
+    }
+
+    /// <summary>
+    /// Represents occupancy sensor(s) setup for a room
+    /// </summary>
+    public class EssentialsRoomOccSensorConfig
+    {
+		[JsonProperty("deviceKey")]
+		public string DeviceKey { get; set; }
+
+		[JsonProperty("timoutMinutes")]
+		public int TimoutMinutes { get; set; }
+    }
+
+	public class EssentialsRoomTechConfig
+	{
+		[JsonProperty("password")]
+		public string Password { get; set; }
+	}
+}

PepperDashEssentials/Room/Config/EssentialsRoomEmergencyConfig.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Room.Config
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EssentialsRoomEmergencyConfig
+    {
+        public EssentialsRoomEmergencyTriggerConfig Trigger { get; set; }
+
+        public string Behavior { get; set; }
+    }
+
+    /// <summary>
+    /// 
+    /// </summary>
+    public class EssentialsRoomEmergencyTriggerConfig
+    {
+        /// <summary>
+        /// contact,
+        /// </summary>
+        public string Type { get; set; }
+        /// <summary>
+        /// Input number if contact
+        /// </summary>
+        public int Number { get; set; }
+
+        public bool TriggerOnClose { get; set; }
+
+    }
+}