Merge pull request #1 in PEC/essentials from development to release

* commit '5f5c963fa44763e6ec4d9bdf1a4008e183dd1873':
  Fixes StartSharing() method in CiscoSparkCodec to only execute if the PresentationSource is > 0 Fixes ecs-612 by adding property to UsageTracking object to determing if the usage tracker is already running.
  resolves ecs-611 and all other known bugs from onsite testing at NYU
  Update debug messages for SIP phone number extraction
  Added objects back to xStatus lost in merge and fixed regex pattern for extracting phone number. Added formatting call to room phone number when displayed on header
  Additional fix to top next meeting warning popups when room is on
  Updated getters for SIP URI and phone number to use correct status properties.  Updates to xConfiguration and xStatus classes to address differences between Spark and Spark Plus
  Fixed Stop Sharing button method to use the room route action method to sync source fb.  Updated xStatus, xConfiguration, booking and phonebook deserialization classes in codec to match onsite return results from NYU room kit plus codec
  Resolved ecs-582,602,608

.gitignore

@@ -20,5 +20,4 @@ obj/
 [Rr]elease*/
 _ReSharper*/
 SIMPLSharpLogs/
-*.projectinfo
-essentials-framework/EssentialDMTestConfig/
+*.projectinfo

Essentials Core/PepperDashEssentialsBase/Comm and IR/ComPortController.cs

@@ -6,6 +6,8 @@ using System.Text.RegularExpressions;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 
+using Newtonsoft.Json;
+
 using PepperDash.Core;
 
 
@@ -24,24 +26,16 @@ namespace PepperDash.Essentials.Core
 		public ComPortController(string key, ComPort port, ComPort.ComPortSpec spec)
 			: base(key)
 		{
-			if (port == null)
-			{
-				Debug.Console(0, this,  "ERROR: Invalid com port, continuing but comms will not function");
-				return;
-			}
-
 			Port = port;
 			Spec = spec;
 			//IsConnected = new BoolFeedback(CommonBoolCue.IsConnected, () => true);
 
 			if (Port.Parent is CrestronControlSystem)
 			{
-
-
 				var result = Port.Register();
 				if (result != eDeviceRegistrationUnRegistrationResponse.Success)
 				{
-					Debug.Console(0, this, "ERROR: Cannot register Com port: {0}", result);
+					Debug.Console(0, this, "WARNING: Cannot register Com port: {0}", result);
 					return; // false
 				}
 			}
@@ -86,15 +80,11 @@ namespace PepperDash.Essentials.Core
 
 		public void SendText(string text)
 		{
-			if (Port == null)
-				return;
 			Port.Send(text);
 		}
 
 		public void SendBytes(byte[] bytes)
 		{
-			if (Port == null)
-				return;
 			var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
 			Port.Send(text);
 		}

Essentials Core/PepperDashEssentialsBase/Comm and IR/CommFactory.cs

@@ -1,7 +1,6 @@
 using System;
 using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
@@ -32,7 +31,7 @@ namespace PepperDash.Essentials.Core
 
 
 		/// <summary>
-		/// Returns a comm method of either com port, TCP, SSH, and puts this into the DeviceManager
+		/// Returns a comm method of either com port, TCP, SSH
 		/// </summary>
 		/// <param name="deviceConfig">The Device config object</param>
 		public static IBasicCommunication CreateCommForDevice(DeviceConfig deviceConfig)
@@ -50,9 +49,6 @@ namespace PepperDash.Essentials.Core
 					case eControlMethod.Com:
 						comm = new ComPortController(deviceConfig.Key + "-com", GetComPort(controlConfig), controlConfig.ComParams);
 						break;
-                    case eControlMethod.Cec:
-                        comm = new CecPortController(deviceConfig.Key + "-cec", GetCecPort(controlConfig));
-                        break;
 					case eControlMethod.IR:
 						break;
                     case eControlMethod.Ssh:
@@ -72,12 +68,6 @@ namespace PepperDash.Essentials.Core
                                 tcp.AutoReconnectIntervalMs = c.AutoReconnectIntervalMs;
                             comm = tcp;
                             break;
-                        }
-                    case eControlMethod.Udp:
-                        {
-                            var udp = new GenericUdpServer(deviceConfig.Key + "-udp", c.Address, c.Port, c.BufferSize);
-                            comm = udp;
-                            break;
                         }
 					case eControlMethod.Telnet:
 						break;
@@ -108,33 +98,6 @@ namespace PepperDash.Essentials.Core
 			return null;
 		}
 
-        /// <summary>
-        ///  Gets an ICec port from a RoutingInput or RoutingOutput on a device
-        /// </summary>
-        /// <param name="config"></param>
-        /// <returns></returns>
-        public static ICec GetCecPort(ControlPropertiesConfig config)
-        {
-            var dev = DeviceManager.GetDeviceForKey(config.ControlPortDevKey);
-
-            if (dev != null)
-            {          
-                var inputPort = (dev as IRoutingInputsOutputs).InputPorts[config.ControlPortName];
-
-                if (inputPort != null)
-                    if (inputPort.Port is ICec)
-                        return inputPort.Port as ICec;
-
-                var outputPort = (dev as IRoutingInputsOutputs).OutputPorts[config.ControlPortName];
-
-                if (outputPort != null)
-                    if (outputPort.Port is ICec)
-                        return outputPort.Port as ICec;
-            }
-            Debug.Console(0, "GetCecPort: Device '{0}' does not have a CEC port called: '{1}'", config.ControlPortDevKey, config.ControlPortName);
-            return null;
-        }
-
 		/// <summary>
 		/// Helper to grab the IComPorts device for this PortDeviceKey. Key "controlSystem" will
 		/// return the ControlSystem object from the Global class.
@@ -162,29 +125,43 @@ namespace PepperDash.Essentials.Core
     public class EssentialsControlPropertiesConfig : 
         PepperDash.Core.ControlPropertiesConfig
     {
+        // ****** All of these things, except for #Pro-specific com stuff, were
+        // moved into PepperDash.Core to help non-pro PortalSync.
+
+        //public eControlMethod Method { get; set; }
+
+        //public string ControlPortDevKey { get; set; }
+
+        //[JsonProperty(NullValueHandling = NullValueHandling.Ignore)] // In case "null" is present in config on this value
+        //public uint ControlPortNumber { get; set; }
+
+        //public TcpSshPropertiesConfig TcpSshProperties { get; set; }
+
+        //public string IrFile { get; set; }
+
+        //public ComPortConfig ComParams { get; set; }
 
         [JsonConverter(typeof(ComSpecJsonConverter))]
         public ComPort.ComPortSpec ComParams { get; set; }
 
-		public string CresnetId { get; set; }
+        //public string IpId { get; set; }
 
-        /// <summary>
-        /// Attempts to provide uint conversion of string CresnetId
-        /// </summary>
-        public uint CresnetIdInt
-        {
-            get
-            {
-                try 
-                {
-                    return Convert.ToUInt32(CresnetId, 16);
-                }
-                catch (Exception)
-                {
-                    throw new FormatException(string.Format("ERROR:Unable to convert Cresnet ID: {0} to hex.  Error:\n{1}", CresnetId));
-                }
-            }
-        }
+        //[JsonIgnore]
+        //public uint IpIdInt { get { return Convert.ToUInt32(IpId, 16); } }
+
+        //public char EndOfLineChar { get; set; }
+
+        ///// <summary>
+        ///// Defaults to Environment.NewLine;
+        ///// </summary>
+        //public string EndOfLineString { get; set; }
+
+        //public string DeviceReadyResponsePattern { get; set; }
+
+        //public EssentialsControlPropertiesConfig()
+        //{
+        //    EndOfLineString = CrestronEnvironment.NewLine;
+        //}
     }
 
     public class IrControlSpec
@@ -193,4 +170,9 @@ namespace PepperDash.Essentials.Core
         public uint PortNumber { get; set; }
         public string File { get; set; }
     }
+
+    //public enum eControlMethod
+    //{
+    //    None = 0, Com, IpId, IR, Ssh, Tcpip, Telnet
+    //}
 }

Essentials Core/PepperDashEssentialsBase/Comm and IR/IRPortHelper.cs

@@ -20,7 +20,7 @@ namespace PepperDash.Essentials.Core
 		{
 			get
 			{
-				return Global.FilePathPrefix + "IR" + Global.DirectorySeparator;
+				return string.Format(@"\NVRAM\Program{0}\IR\", InitialParametersClass.ApplicationNumber);
 			}
 		}
 

Essentials Core/PepperDashEssentialsBase/Comm and IR/REMOVE ComPortConfig.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+
+	//public class ComPortConfig
+	//{
+	//    //public string ContolPortDevKey { get; set; }
+
+	//    //public uint ControlPortNumber { get; set; }
+
+	//    [JsonConverter(typeof(ComSpecJsonConverter))]
+	//    public ComPort.ComPortSpec ComParams { get; set; }
+	//}
+}

Essentials Core/PepperDashEssentialsBase/Config/BasicConfig.cs

@@ -17,6 +17,9 @@ namespace PepperDash.Essentials.Core.Config
 		[JsonProperty("info")]
 		public InfoConfig Info { get; set; }
 
+		//[JsonProperty("roomLists")]
+		//public Dictionary<string, List<string>> RoomLists { get; set; }
+
 		[JsonProperty("devices")]
 		public List<DeviceConfig> Devices { get; set; }
 
@@ -26,9 +29,6 @@ namespace PepperDash.Essentials.Core.Config
 		[JsonProperty("tieLines")]
 		public List<TieLineConfig> TieLines { get; set; }
 
-        [JsonProperty("joinMaps")]
-        public Dictionary<string, string> JoinMaps { get; set; }
-
 		/// <summary>
 		/// Checks SourceLists for a given list and returns it if found. Otherwise, returns null
 		/// </summary>

Essentials Core/PepperDashEssentialsBase/Config/InfoConfig.cs

@@ -0,0 +1,36 @@
+using System;
+
+using Newtonsoft.Json;
+
+namespace PepperDash.Essentials.Core.Config
+{
+	/// <summary>
+	/// Represents the info section of a Config file
+	/// </summary>
+	public class InfoConfig
+	{
+		[JsonProperty("name")]
+		public string Name { get; set; }
+
+		[JsonProperty("date")]
+		public DateTime Date { get; set; }
+		
+		[JsonProperty("type")]
+		public string Type { get; set; }
+		
+		[JsonProperty("version")]
+		public string Version { get; set; }
+		
+		[JsonProperty("comment")]
+		public string Comment { get; set; }
+
+		public InfoConfig()
+		{
+			Name = "";
+			Date = DateTime.Now;
+			Type = "";
+			Version = "";
+			Comment = "";
+		}
+	}
+}

Essentials Core/PepperDashEssentialsBase/Constants/CommonCues.cs

@@ -1,127 +1,127 @@
-using Crestron.SimplSharpPro;
-
-namespace PepperDash.Essentials.Core
-{
-	public static class CommonBoolCue
-	{
-		public static readonly Cue Power = new Cue("Power", 101, eCueType.Bool);
-		public static readonly Cue PowerOn = new Cue("PowerOn", 102, eCueType.Bool);
-		public static readonly Cue PowerOff = new Cue("PowerOff", 103, eCueType.Bool);
-
-		public static readonly Cue HasPowerFeedback = new Cue("HasPowerFeedback", 101, eCueType.Bool);
-		public static readonly Cue PowerOnFeedback = new Cue("PowerOnFeedback", 102, eCueType.Bool);
-		public static readonly Cue IsOnlineFeedback = new Cue("IsOnlineFeedback", 104, eCueType.Bool);
-		public static readonly Cue IsWarmingUp = new Cue("IsWarmingUp", 105, eCueType.Bool);
-		public static readonly Cue IsCoolingDown = new Cue("IsCoolingDown", 106, eCueType.Bool);
-
-		public static readonly Cue Dash = new Cue("Dash", 109, eCueType.Bool);
-		public static readonly Cue Digit0 = new Cue("Digit0", 110, eCueType.Bool);
-		public static readonly Cue Digit1 = new Cue("Digit1", 111, eCueType.Bool);
-		public static readonly Cue Digit2 = new Cue("Digit2", 112, eCueType.Bool);
-		public static readonly Cue Digit3 = new Cue("Digit3", 113, eCueType.Bool);
-		public static readonly Cue Digit4 = new Cue("Digit4", 114, eCueType.Bool);
-		public static readonly Cue Digit5 = new Cue("Digit5", 115, eCueType.Bool);
-		public static readonly Cue Digit6 = new Cue("Digit6", 116, eCueType.Bool);
-		public static readonly Cue Digit7 = new Cue("Digit7", 117, eCueType.Bool);
-		public static readonly Cue Digit8 = new Cue("Digit8", 118, eCueType.Bool);
-		public static readonly Cue Digit9 = new Cue("Digit9", 119, eCueType.Bool);
-		public static readonly Cue KeypadMisc1 = new Cue("KeypadMisc1", 120, eCueType.Bool);
-		public static readonly Cue KeypadMisc2 = new Cue("KeypadMisc2", 121, eCueType.Bool);
-
-		public static readonly Cue NumericEnter = new Cue("Enter", 122, eCueType.Bool);
-		public static readonly Cue ChannelUp = new Cue("ChannelUp", 123, eCueType.Bool);
-		public static readonly Cue ChannelDown = new Cue("ChannelDown", 124, eCueType.Bool);
-		public static readonly Cue Last = new Cue("Last", 125, eCueType.Bool);
-		public static readonly Cue OpenClose = new Cue("OpenClose", 126, eCueType.Bool);
-		public static readonly Cue Subtitle = new Cue("Subtitle", 127, eCueType.Bool);
-		public static readonly Cue Audio = new Cue("Audio", 128, eCueType.Bool);
-		public static readonly Cue Info = new Cue("Info", 129, eCueType.Bool);
-		public static readonly Cue Menu = new Cue("Menu", 130, eCueType.Bool);
-		public static readonly Cue DeviceMenu = new Cue("DeviceMenu", 131, eCueType.Bool);
-		public static readonly Cue Return = new Cue("Return", 132, eCueType.Bool);
-		public static readonly Cue Back = new Cue("Back", 133, eCueType.Bool);
-		public static readonly Cue Exit = new Cue("Exit", 134, eCueType.Bool);
-		public static readonly Cue Clear = new Cue("Clear", 135, eCueType.Bool);
-		public static readonly Cue List = new Cue("List", 136, eCueType.Bool);
-		public static readonly Cue Guide = new Cue("Guide", 137, eCueType.Bool);
-		public static readonly Cue Am = new Cue("Am", 136, eCueType.Bool);
-		public static readonly Cue Fm = new Cue("Fm", 137, eCueType.Bool);
-		public static readonly Cue Up = new Cue("Up", 138, eCueType.Bool);
-		public static readonly Cue Down = new Cue("Down", 139, eCueType.Bool);
-		public static readonly Cue Left = new Cue("Left", 140, eCueType.Bool);
-		public static readonly Cue Right = new Cue("Right", 141, eCueType.Bool);
-		public static readonly Cue Select = new Cue("Select", 142, eCueType.Bool);
-		public static readonly Cue SmartApps = new Cue("SmartApps", 143, eCueType.Bool);
-		public static readonly Cue Dvr = new Cue("Dvr", 144, eCueType.Bool);
-
-		public static readonly Cue Play = new Cue("Play", 145, eCueType.Bool);
-		public static readonly Cue Pause = new Cue("Pause", 146, eCueType.Bool);
-		public static readonly Cue Stop = new Cue("Stop", 147, eCueType.Bool);
-		public static readonly Cue ChapNext = new Cue("ChapNext", 148, eCueType.Bool);
-		public static readonly Cue ChapPrevious = new Cue("ChapPrevious", 149, eCueType.Bool);
-		public static readonly Cue Rewind = new Cue("Rewind", 150, eCueType.Bool);
-		public static readonly Cue Ffwd = new Cue("Ffwd", 151, eCueType.Bool);
-		public static readonly Cue Replay = new Cue("Replay", 152, eCueType.Bool);
-		public static readonly Cue Advance = new Cue("Advance", 153, eCueType.Bool);
-		public static readonly Cue Record = new Cue("Record", 154, eCueType.Bool);
-		public static readonly Cue Red = new Cue("Red", 155, eCueType.Bool);
-		public static readonly Cue Green = new Cue("Green", 156, eCueType.Bool);
-		public static readonly Cue Yellow = new Cue("Yellow", 157, eCueType.Bool);
-		public static readonly Cue Blue = new Cue("Blue", 158, eCueType.Bool);
-		public static readonly Cue Home = new Cue("Home", 159, eCueType.Bool);
-		public static readonly Cue PopUp = new Cue("PopUp", 160, eCueType.Bool);
-		public static readonly Cue PageUp = new Cue("PageUp", 161, eCueType.Bool);
-		public static readonly Cue PageDown = new Cue("PageDown", 162, eCueType.Bool);
-		public static readonly Cue Search = new Cue("Search", 163, eCueType.Bool);
-		public static readonly Cue Setup = new Cue("Setup", 164, eCueType.Bool);
-		public static readonly Cue RStep = new Cue("RStep", 165, eCueType.Bool);
-		public static readonly Cue FStep = new Cue("FStep", 166, eCueType.Bool);
-
-		public static readonly Cue IsConnected = new Cue("IsConnected", 281, eCueType.Bool);
-		public static readonly Cue IsOk = new Cue("IsOk", 282, eCueType.Bool);
-		public static readonly Cue InWarning = new Cue("InWarning", 283, eCueType.Bool);
-		public static readonly Cue InError = new Cue("InError", 284, eCueType.Bool);
-		public static readonly Cue StatusUnknown = new Cue("StatusUnknown", 285, eCueType.Bool);
-        
-        public static readonly Cue VolumeUp = new Cue("VolumeUp", 401, eCueType.Bool);
-		public static readonly Cue VolumeDown = new Cue("VolumeDown", 402, eCueType.Bool);
-		public static readonly Cue MuteOn = new Cue("MuteOn", 403, eCueType.Bool);
-		public static readonly Cue MuteOff = new Cue("MuteOff", 404, eCueType.Bool);
-		public static readonly Cue MuteToggle = new Cue("MuteToggle", 405, eCueType.Bool);
-		public static readonly Cue ShowVolumeButtons = new Cue("ShowVolumeButtons", 406, eCueType.Bool);
-		public static readonly Cue ShowVolumeSlider = new Cue("ShowVolumeSlider", 407, eCueType.Bool);
-
-		public static readonly Cue Hdmi1 = new Cue("Hdmi1", 451, eCueType.Bool);
-		public static readonly Cue Hdmi2 = new Cue("Hdmi2", 452, eCueType.Bool);
-		public static readonly Cue Hdmi3 = new Cue("Hdmi3", 453, eCueType.Bool);
-		public static readonly Cue Hdmi4 = new Cue("Hdmi4", 454, eCueType.Bool);
-		public static readonly Cue Hdmi5 = new Cue("Hdmi5", 455, eCueType.Bool);
-		public static readonly Cue Hdmi6 = new Cue("Hdmi6", 456, eCueType.Bool);
-		public static readonly Cue DisplayPort1 = new Cue("DisplayPort1", 457, eCueType.Bool);
-		public static readonly Cue DisplayPort2 = new Cue("DisplayPort2", 458, eCueType.Bool);
-		public static readonly Cue Dvi1 = new Cue("Dvi1", 459, eCueType.Bool);
-		public static readonly Cue Dvi2 = new Cue("Dvi2", 460, eCueType.Bool);
-		public static readonly Cue Video1 = new Cue("Video1", 461, eCueType.Bool);
-		public static readonly Cue Video2 = new Cue("Video2", 462, eCueType.Bool);
-		public static readonly Cue Component1 = new Cue("Component1", 463, eCueType.Bool);
-		public static readonly Cue Component2 = new Cue("Component2", 464, eCueType.Bool);
-		public static readonly Cue Vga1 = new Cue("Vga1", 465, eCueType.Bool);
-		public static readonly Cue Vga2 = new Cue("Vga2", 466, eCueType.Bool);
-		public static readonly Cue Rgb1 = new Cue("Rgb1", 467, eCueType.Bool);
-		public static readonly Cue Rgb2 = new Cue("Rgb2", 468, eCueType.Bool);
-		public static readonly Cue Antenna = new Cue("Antenna", 469, eCueType.Bool);
-
-        public static readonly Cue InCall = new Cue("InCall", 501, eCueType.Bool);
-	}
-
-	public static class CommonIntCue
-	{
-		public static readonly Cue MainVolumeLevel = new Cue("MainVolumeLevel", 401, eCueType.Int);
-		public static readonly Cue MainVolumeLevelFeedback = new Cue("MainVolumeLevelFeedback", 401, eCueType.Int);
-	}
-
-	public static class CommonStringCue
-	{
-		public static readonly Cue IpConnectionsText = new Cue("IpConnectionsText", 9999, eCueType.String);
-	}
+using Crestron.SimplSharpPro;
+
+namespace PepperDash.Essentials.Core
+{
+	public static class CommonBoolCue
+	{
+		public static readonly Cue Power = new Cue("Power", 101, eCueType.Bool);
+		public static readonly Cue PowerOn = new Cue("PowerOn", 102, eCueType.Bool);
+		public static readonly Cue PowerOff = new Cue("PowerOff", 103, eCueType.Bool);
+
+		public static readonly Cue HasPowerFeedback = new Cue("HasPowerFeedback", 101, eCueType.Bool);
+		public static readonly Cue PowerOnFeedback = new Cue("PowerOnFeedback", 102, eCueType.Bool);
+		public static readonly Cue IsOnlineFeedback = new Cue("IsOnlineFeedback", 104, eCueType.Bool);
+		public static readonly Cue IsWarmingUp = new Cue("IsWarmingUp", 105, eCueType.Bool);
+		public static readonly Cue IsCoolingDown = new Cue("IsCoolingDown", 106, eCueType.Bool);
+
+		public static readonly Cue Dash = new Cue("Dash", 109, eCueType.Bool);
+		public static readonly Cue Digit0 = new Cue("Digit0", 110, eCueType.Bool);
+		public static readonly Cue Digit1 = new Cue("Digit1", 111, eCueType.Bool);
+		public static readonly Cue Digit2 = new Cue("Digit2", 112, eCueType.Bool);
+		public static readonly Cue Digit3 = new Cue("Digit3", 113, eCueType.Bool);
+		public static readonly Cue Digit4 = new Cue("Digit4", 114, eCueType.Bool);
+		public static readonly Cue Digit5 = new Cue("Digit5", 115, eCueType.Bool);
+		public static readonly Cue Digit6 = new Cue("Digit6", 116, eCueType.Bool);
+		public static readonly Cue Digit7 = new Cue("Digit7", 117, eCueType.Bool);
+		public static readonly Cue Digit8 = new Cue("Digit8", 118, eCueType.Bool);
+		public static readonly Cue Digit9 = new Cue("Digit9", 119, eCueType.Bool);
+		public static readonly Cue KeypadMisc1 = new Cue("KeypadMisc1", 120, eCueType.Bool);
+		public static readonly Cue KeypadMisc2 = new Cue("KeypadMisc2", 121, eCueType.Bool);
+
+		public static readonly Cue NumericEnter = new Cue("Enter", 122, eCueType.Bool);
+		public static readonly Cue ChannelUp = new Cue("ChannelUp", 123, eCueType.Bool);
+		public static readonly Cue ChannelDown = new Cue("ChannelDown", 124, eCueType.Bool);
+		public static readonly Cue Last = new Cue("Last", 125, eCueType.Bool);
+		public static readonly Cue OpenClose = new Cue("OpenClose", 126, eCueType.Bool);
+		public static readonly Cue Subtitle = new Cue("Subtitle", 127, eCueType.Bool);
+		public static readonly Cue Audio = new Cue("Audio", 128, eCueType.Bool);
+		public static readonly Cue Info = new Cue("Info", 129, eCueType.Bool);
+		public static readonly Cue Menu = new Cue("Menu", 130, eCueType.Bool);
+		public static readonly Cue DeviceMenu = new Cue("DeviceMenu", 131, eCueType.Bool);
+		public static readonly Cue Return = new Cue("Return", 132, eCueType.Bool);
+		public static readonly Cue Back = new Cue("Back", 133, eCueType.Bool);
+		public static readonly Cue Exit = new Cue("Exit", 134, eCueType.Bool);
+		public static readonly Cue Clear = new Cue("Clear", 135, eCueType.Bool);
+		public static readonly Cue List = new Cue("List", 136, eCueType.Bool);
+		public static readonly Cue Guide = new Cue("Guide", 137, eCueType.Bool);
+		public static readonly Cue Am = new Cue("Am", 136, eCueType.Bool);
+		public static readonly Cue Fm = new Cue("Fm", 137, eCueType.Bool);
+		public static readonly Cue Up = new Cue("Up", 138, eCueType.Bool);
+		public static readonly Cue Down = new Cue("Down", 139, eCueType.Bool);
+		public static readonly Cue Left = new Cue("Left", 140, eCueType.Bool);
+		public static readonly Cue Right = new Cue("Right", 141, eCueType.Bool);
+		public static readonly Cue Select = new Cue("Select", 142, eCueType.Bool);
+		public static readonly Cue SmartApps = new Cue("SmartApps", 143, eCueType.Bool);
+		public static readonly Cue Dvr = new Cue("Dvr", 144, eCueType.Bool);
+
+		public static readonly Cue Play = new Cue("Play", 145, eCueType.Bool);
+		public static readonly Cue Pause = new Cue("Pause", 146, eCueType.Bool);
+		public static readonly Cue Stop = new Cue("Stop", 147, eCueType.Bool);
+		public static readonly Cue ChapNext = new Cue("ChapNext", 148, eCueType.Bool);
+		public static readonly Cue ChapPrevious = new Cue("ChapPrevious", 149, eCueType.Bool);
+		public static readonly Cue Rewind = new Cue("Rewind", 150, eCueType.Bool);
+		public static readonly Cue Ffwd = new Cue("Ffwd", 151, eCueType.Bool);
+		public static readonly Cue Replay = new Cue("Replay", 152, eCueType.Bool);
+		public static readonly Cue Advance = new Cue("Advance", 153, eCueType.Bool);
+		public static readonly Cue Record = new Cue("Record", 154, eCueType.Bool);
+		public static readonly Cue Red = new Cue("Red", 155, eCueType.Bool);
+		public static readonly Cue Green = new Cue("Green", 156, eCueType.Bool);
+		public static readonly Cue Yellow = new Cue("Yellow", 157, eCueType.Bool);
+		public static readonly Cue Blue = new Cue("Blue", 158, eCueType.Bool);
+		public static readonly Cue Home = new Cue("Home", 159, eCueType.Bool);
+		public static readonly Cue PopUp = new Cue("PopUp", 160, eCueType.Bool);
+		public static readonly Cue PageUp = new Cue("PageUp", 161, eCueType.Bool);
+		public static readonly Cue PageDown = new Cue("PageDown", 162, eCueType.Bool);
+		public static readonly Cue Search = new Cue("Search", 163, eCueType.Bool);
+		public static readonly Cue Setup = new Cue("Setup", 164, eCueType.Bool);
+		public static readonly Cue RStep = new Cue("RStep", 165, eCueType.Bool);
+		public static readonly Cue FStep = new Cue("FStep", 166, eCueType.Bool);
+
+		public static readonly Cue IsConnected = new Cue("IsConnected", 281, eCueType.Bool);
+		public static readonly Cue IsOk = new Cue("IsOk", 282, eCueType.Bool);
+		public static readonly Cue InWarning = new Cue("InWarning", 283, eCueType.Bool);
+		public static readonly Cue InError = new Cue("InError", 284, eCueType.Bool);
+		public static readonly Cue StatusUnknown = new Cue("StatusUnknown", 285, eCueType.Bool);
+        
+        public static readonly Cue VolumeUp = new Cue("VolumeUp", 401, eCueType.Bool);
+		public static readonly Cue VolumeDown = new Cue("VolumeDown", 402, eCueType.Bool);
+		public static readonly Cue MuteOn = new Cue("MuteOn", 403, eCueType.Bool);
+		public static readonly Cue MuteOff = new Cue("MuteOff", 404, eCueType.Bool);
+		public static readonly Cue MuteToggle = new Cue("MuteToggle", 405, eCueType.Bool);
+		public static readonly Cue ShowVolumeButtons = new Cue("ShowVolumeButtons", 406, eCueType.Bool);
+		public static readonly Cue ShowVolumeSlider = new Cue("ShowVolumeSlider", 407, eCueType.Bool);
+
+		public static readonly Cue Hdmi1 = new Cue("Hdmi1", 451, eCueType.Bool);
+		public static readonly Cue Hdmi2 = new Cue("Hdmi2", 452, eCueType.Bool);
+		public static readonly Cue Hdmi3 = new Cue("Hdmi3", 453, eCueType.Bool);
+		public static readonly Cue Hdmi4 = new Cue("Hdmi4", 454, eCueType.Bool);
+		public static readonly Cue Hdmi5 = new Cue("Hdmi5", 455, eCueType.Bool);
+		public static readonly Cue Hdmi6 = new Cue("Hdmi6", 456, eCueType.Bool);
+		public static readonly Cue DisplayPort1 = new Cue("DisplayPort1", 457, eCueType.Bool);
+		public static readonly Cue DisplayPort2 = new Cue("DisplayPort2", 458, eCueType.Bool);
+		public static readonly Cue Dvi1 = new Cue("Dvi1", 459, eCueType.Bool);
+		public static readonly Cue Dvi2 = new Cue("Dvi2", 460, eCueType.Bool);
+		public static readonly Cue Video1 = new Cue("Video1", 461, eCueType.Bool);
+		public static readonly Cue Video2 = new Cue("Video2", 462, eCueType.Bool);
+		public static readonly Cue Component1 = new Cue("Component1", 463, eCueType.Bool);
+		public static readonly Cue Component2 = new Cue("Component2", 464, eCueType.Bool);
+		public static readonly Cue Vga1 = new Cue("Vga1", 465, eCueType.Bool);
+		public static readonly Cue Vga2 = new Cue("Vga2", 466, eCueType.Bool);
+		public static readonly Cue Rgb1 = new Cue("Rgb1", 467, eCueType.Bool);
+		public static readonly Cue Rgb2 = new Cue("Rgb2", 468, eCueType.Bool);
+		public static readonly Cue Antenna = new Cue("Antenna", 469, eCueType.Bool);
+
+        public static readonly Cue InCall = new Cue("InCall", 501, eCueType.Bool);
+	}
+
+	public static class CommonIntCue
+	{
+		public static readonly Cue MainVolumeLevel = new Cue("MainVolumeLevel", 401, eCueType.Int);
+		public static readonly Cue MainVolumeLevelFeedback = new Cue("MainVolumeLevelFeedback", 401, eCueType.Int);
+	}
+
+	public static class CommonStringCue
+	{
+		public static readonly Cue IpConnectionsText = new Cue("IpConnectionsText", 9999, eCueType.String);
+	}
 }

Essentials Core/PepperDashEssentialsBase/Crestron/CrestronGenericBaseDevice.cs

@@ -1,128 +1,122 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// A bridge class to cover the basic features of GenericBase hardware
-	/// </summary>
-	public class CrestronGenericBaseDevice : Device, IOnline, IHasFeedback, ICommunicationMonitor, IUsageTracking
-	{
-		public virtual GenericBase Hardware { get; protected set; }
-
-		public BoolFeedback IsOnline { get; private set; }
-		public BoolFeedback IsRegistered { get; private set; }
-		public StringFeedback IpConnectionsText { get; private set; }
-
-		public CrestronGenericBaseDevice(string key, string name, GenericBase hardware)
-			: base(key, name)
-		{
-			Hardware = hardware;
-			IsOnline = new BoolFeedback(CommonBoolCue.IsOnlineFeedback, () => Hardware.IsOnline);
-			IsRegistered = new BoolFeedback(new Cue("IsRegistered", 0, eCueType.Bool), () => Hardware.Registered);
-			IpConnectionsText = new StringFeedback(CommonStringCue.IpConnectionsText, () => 
-				string.Join(",", Hardware.ConnectedIpList.Select(cip => cip.DeviceIpAddress).ToArray()));
-			CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, hardware, 120000, 300000);
-		}
-
-		/// <summary>
-		/// Make sure that overriding classes call this!
-		/// Registers the Crestron device, connects up to the base events, starts communication monitor
-		/// </summary>
-		public override bool CustomActivate()
-		{
-            Debug.Console(0, this, "Activating");
-            var response = Hardware.RegisterWithLogging(Key);
-            if (response != eDeviceRegistrationUnRegistrationResponse.Success)
-            {
-<<<<<<< HEAD
-				Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
-				return false;
-			}
-=======
-                Debug.Console(0, this, "ERROR: Cannot register Crestron device: {0}", response);
-                return false;
-            }
->>>>>>> origin/feature/ecs-342-neil
-            Hardware.OnlineStatusChange += new OnlineStatusChangeEventHandler(Hardware_OnlineStatusChange);
-            CommunicationMonitor.Start();    
-
-			return true;
-		}
-
-		/// <summary>
-		/// This disconnects events and unregisters the base hardware device.
-		/// </summary>
-		/// <returns></returns>
-		public override bool Deactivate()
-		{
-			CommunicationMonitor.Stop();
-			Hardware.OnlineStatusChange -= Hardware_OnlineStatusChange;
-
-			return Hardware.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
-		}
-
-		/// <summary>
-		/// Returns a list containing the Outputs that we want to expose.
-		/// </summary>
-		public virtual List<Feedback> Feedbacks
-		{
-			get
-			{
-				return new List<Feedback>
-				{
-					IsOnline,
-					IsRegistered,
-					IpConnectionsText
-				};
-			}
-		}
-
-		void Hardware_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
-		{
-			IsOnline.FireUpdate();
-		}
-
-		#region IStatusMonitor Members
-
-		public StatusMonitorBase CommunicationMonitor { get; private set; }
-		#endregion
-
-        #region IUsageTracking Members
-
-        public UsageTracking UsageTracker { get; set; }
-
-        #endregion
-	}
-
-	//***********************************************************************************
-	public class CrestronGenericBaseDeviceEventIds
-	{
-		public const uint IsOnline = 1;
-		public const uint IpConnectionsText =2;
-	}
-
-	/// <summary>
-	/// Adds logging to Register() failure
-	/// </summary>
-	public static class GenericBaseExtensions
-	{
-		public static eDeviceRegistrationUnRegistrationResponse RegisterWithLogging(this GenericBase device, string key)
-		{
-			var result = device.Register();
-			if (result != eDeviceRegistrationUnRegistrationResponse.Success)
-			{
-				Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot register device '{0}': {1}", key, result);
-			}
-			return result;
-		}
-
-	}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// A bridge class to cover the basic features of GenericBase hardware
+	/// </summary>
+	public class CrestronGenericBaseDevice : Device, IOnline, IHasFeedback, ICommunicationMonitor, IUsageTracking
+	{
+		public virtual GenericBase Hardware { get; protected set; }
+
+		public BoolFeedback IsOnline { get; private set; }
+		public BoolFeedback IsRegistered { get; private set; }
+		public StringFeedback IpConnectionsText { get; private set; }
+
+		public CrestronGenericBaseDevice(string key, string name, GenericBase hardware)
+			: base(key, name)
+		{
+			Hardware = hardware;
+			IsOnline = new BoolFeedback(CommonBoolCue.IsOnlineFeedback, () => Hardware.IsOnline);
+			IsRegistered = new BoolFeedback(new Cue("IsRegistered", 0, eCueType.Bool), () => Hardware.Registered);
+			IpConnectionsText = new StringFeedback(CommonStringCue.IpConnectionsText, () => 
+				string.Join(",", Hardware.ConnectedIpList.Select(cip => cip.DeviceIpAddress).ToArray()));
+			CommunicationMonitor = new CrestronGenericBaseCommunicationMonitor(this, hardware, 120000, 300000);
+		}
+
+		/// <summary>
+		/// Make sure that overriding classes call this!
+		/// Registers the Crestron device, connects up to the base events, starts communication monitor
+		/// </summary>
+		public override bool CustomActivate()
+		{
+            new CTimer(o =>
+            {
+                Debug.Console(1, this, "Activating");
+                var response = Hardware.RegisterWithLogging(Key);
+                if (response == eDeviceRegistrationUnRegistrationResponse.Success)
+                {
+                    Hardware.OnlineStatusChange += new OnlineStatusChangeEventHandler(Hardware_OnlineStatusChange);
+                    CommunicationMonitor.Start();
+                }
+            }, 0);
+			return true;
+		}
+
+		/// <summary>
+		/// This disconnects events and unregisters the base hardware device.
+		/// </summary>
+		/// <returns></returns>
+		public override bool Deactivate()
+		{
+			CommunicationMonitor.Stop();
+			Hardware.OnlineStatusChange -= Hardware_OnlineStatusChange;
+
+			return Hardware.UnRegister() == eDeviceRegistrationUnRegistrationResponse.Success;
+		}
+
+		/// <summary>
+		/// Returns a list containing the Outputs that we want to expose.
+		/// </summary>
+		public virtual List<Feedback> Feedbacks
+		{
+			get
+			{
+				return new List<Feedback>
+				{
+					IsOnline,
+					IsRegistered,
+					IpConnectionsText
+				};
+			}
+		}
+
+		void Hardware_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args)
+		{
+			IsOnline.FireUpdate();
+		}
+
+		#region IStatusMonitor Members
+
+		public StatusMonitorBase CommunicationMonitor { get; private set; }
+		#endregion
+
+        #region IUsageTracking Members
+
+        public UsageTracking UsageTracker { get; set; }
+
+        #endregion
+	}
+
+	//***********************************************************************************
+	public class CrestronGenericBaseDeviceEventIds
+	{
+		public const uint IsOnline = 1;
+		public const uint IpConnectionsText =2;
+	}
+
+	/// <summary>
+	/// Adds logging to Register() failure
+	/// </summary>
+	public static class GenericBaseExtensions
+	{
+		public static eDeviceRegistrationUnRegistrationResponse RegisterWithLogging(this GenericBase device, string key)
+		{
+			var result = device.Register();
+			if (result != eDeviceRegistrationUnRegistrationResponse.Success)
+			{
+				Debug.Console(0, Debug.ErrorLogLevel.Error, "Cannot register device '{0}': {1}", key, result);
+			}
+			return result;
+		}
+
+	}
 }

Essentials Core/PepperDashEssentialsBase/Cues and DevAction/Cues.cs

@@ -27,7 +27,7 @@ namespace PepperDash.Essentials.Core
 
 	public enum eCueType
 	{
-		Bool, Int, String, Serial, Void, Other
+		Bool, Int, String, Void, Other
 	}
 
 

Essentials Core/PepperDashEssentialsBase/Debug/Debug.cs

@@ -0,0 +1,142 @@
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using Crestron.SimplSharp;
+//using Crestron.SimplSharp.CrestronDataStore;
+//using Crestron.SimplSharpPro;
+
+
+//namespace PepperDash.Essentials.Core
+//{
+//    public class Debug
+//    {
+//        public static uint Level { get; private set; }
+
+//        /// <summary>
+//        /// This should called from the ControlSystem Initiailize method.
+//        /// </summary>
+//        public static void Initialize()
+//        {
+//            // Add command to console
+//            CrestronConsole.AddNewConsoleCommand(SetDebugFromConsole, "appdebug", 
+//                "appdebug:P [0-2]: Sets the application's console debug message level", 
+//                ConsoleAccessLevelEnum.AccessOperator);
+
+//            uint level = 0;
+//            var err = CrestronDataStoreStatic.GetGlobalUintValue("DebugLevel", out level);
+//            if (err == CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
+//                SetDebugLevel(level);
+//            else if (err == CrestronDataStore.CDS_ERROR.CDS_RECORD_NOT_FOUND)
+//                CrestronDataStoreStatic.SetGlobalUintValue("DebugLevel", 0);
+//            else
+//                CrestronConsole.PrintLine("Error restoring console debug level setting: {0}", err);
+//        }
+
+//        /// <summary>
+//        /// Callback for console command
+//        /// </summary>
+//        /// <param name="levelString"></param>
+//        public static void SetDebugFromConsole(string levelString)
+//        {
+//            try
+//            {
+//                if (string.IsNullOrEmpty(levelString.Trim()))
+//                {
+//                    CrestronConsole.PrintLine("AppDebug level = {0}", Level);
+//                    return;
+//                }
+
+//                SetDebugLevel(Convert.ToUInt32(levelString));
+//            }
+//            catch
+//            {
+//                CrestronConsole.PrintLine("Usage: appdebug:P [0-2]");
+//            }
+//        }
+
+//        /// <summary>
+//        /// Sets the debug level
+//        /// </summary>
+//        /// <param name="level"> Valid values 0 (no debug), 1 (critical), 2 (all messages)</param>
+//        public static void SetDebugLevel(uint level)
+//        {
+//            if (level <= 2)
+//            {
+//                Level = 2;
+//                CrestronConsole.PrintLine("[Application {0}], Debug level set to {1}", 
+//                    InitialParametersClass.ApplicationNumber, level);
+//                var err = CrestronDataStoreStatic.SetGlobalUintValue("DebugLevel", level);
+//                if(err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
+//                    CrestronConsole.PrintLine("Error saving console debug level setting: {0}", err);
+//            }
+//        }
+
+//        /// <summary>
+//        /// Prints message to console if current debug level is equal to or higher than the level of this message.
+//        /// Uses CrestronConsole.PrintLine.
+//        /// </summary>
+//        /// <param name="level"></param>
+//        /// <param name="format">Console format string</param>
+//        /// <param name="items">Object parameters</param>
+//        public static void Console(uint level, string format, params object[] items)
+//        {
+//            if (Level >= level)
+//                CrestronConsole.PrintLine("App {0}:{1}", InitialParametersClass.ApplicationNumber,
+//                    string.Format(format, items));
+//        }
+
+//        /// <summary>
+//        /// Appends a device Key to the beginning of a message
+//        /// </summary>
+//        public static void Console(uint level, IKeyed dev, string format, params object[] items)
+//        {
+//            if (Level >= level)
+//                Console(level, "[{0}] {1}", dev.Key, string.Format(format, items));
+//        }
+
+//        public static void Console(uint level, IKeyed dev, ErrorLogLevel errorLogLevel, 
+//            string format, params object[] items)
+//        {
+//            if (Level >= level)
+//            {
+//                var str = string.Format("[{0}] {1}", dev.Key, string.Format(format, items));
+//                Console(level, str);
+//                LogError(errorLogLevel, str);
+//            }
+//        }
+
+//        public static void Console(uint level, ErrorLogLevel errorLogLevel,
+//            string format, params object[] items)
+//        {
+//            if (Level >= level)
+//            {
+//                var str = string.Format(format, items);
+//                Console(level, str);
+//                LogError(errorLogLevel, str);
+//            }
+//        }
+
+//        public static void LogError(ErrorLogLevel errorLogLevel, string str)
+//        {
+//            string msg = string.Format("App {0}:{1}", InitialParametersClass.ApplicationNumber, str);
+//            switch (errorLogLevel)
+//            {
+//                case ErrorLogLevel.Error:
+//                    ErrorLog.Error(msg);
+//                    break;
+//                case ErrorLogLevel.Warning:
+//                    ErrorLog.Warn(msg);
+//                    break;
+//                case ErrorLogLevel.Notice:
+//                    ErrorLog.Notice(msg);
+//                    break;
+//            }
+//        }
+
+//        public enum ErrorLogLevel
+//        {
+//            Error, Warning, Notice, None
+//        }
+//    }
+//}

Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IDPad.cs

@@ -1,50 +1,50 @@
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public interface IDPad
-	{
-		void Up(bool pressRelease);
-		void Down(bool pressRelease);
-		void Left(bool pressRelease);
-		void Right(bool pressRelease);
-		void Select(bool pressRelease);
-		void Menu(bool pressRelease);
-		void Exit(bool pressRelease);
-	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IDPadExtensions
-	{
-		public static void LinkButtons(this IDPad dev, BasicTriList triList)
-		{
-			triList.SetBoolSigAction(138, dev.Up);
-			triList.SetBoolSigAction(139, dev.Down);
-			triList.SetBoolSigAction(140, dev.Left);
-			triList.SetBoolSigAction(141, dev.Right);
-			triList.SetBoolSigAction(142, dev.Select);
-			triList.SetBoolSigAction(130, dev.Menu);
-			triList.SetBoolSigAction(134, dev.Exit);
-		}
-
-		public static void UnlinkButtons(this IDPad dev, BasicTriList triList)
-		{
-			triList.ClearBoolSigAction(138);
-			triList.ClearBoolSigAction(139);
-			triList.ClearBoolSigAction(140);
-			triList.ClearBoolSigAction(141);
-			triList.ClearBoolSigAction(142);
-			triList.ClearBoolSigAction(130);
-			triList.ClearBoolSigAction(134);
-		}
-	}
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.SmartObjects;
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public interface IDPad
+	{
+		void Up(bool pressRelease);
+		void Down(bool pressRelease);
+		void Left(bool pressRelease);
+		void Right(bool pressRelease);
+		void Select(bool pressRelease);
+		void Menu(bool pressRelease);
+		void Exit(bool pressRelease);
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public static class IDPadExtensions
+	{
+		public static void LinkButtons(this IDPad dev, BasicTriList triList)
+		{
+			triList.SetBoolSigAction(138, dev.Up);
+			triList.SetBoolSigAction(139, dev.Down);
+			triList.SetBoolSigAction(140, dev.Left);
+			triList.SetBoolSigAction(141, dev.Right);
+			triList.SetBoolSigAction(142, dev.Select);
+			triList.SetBoolSigAction(130, dev.Menu);
+			triList.SetBoolSigAction(134, dev.Exit);
+		}
+
+		public static void UnlinkButtons(this IDPad dev, BasicTriList triList)
+		{
+			triList.ClearBoolSigAction(138);
+			triList.ClearBoolSigAction(139);
+			triList.ClearBoolSigAction(140);
+			triList.ClearBoolSigAction(141);
+			triList.ClearBoolSigAction(142);
+			triList.ClearBoolSigAction(130);
+			triList.ClearBoolSigAction(134);
+		}
+	}
 }

Essentials Core/PepperDashEssentialsBase/DeviceTypeInterfaces/IPower.cs

@@ -1,48 +1,48 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DeviceSupport;
-using Crestron.SimplSharpPro.Fusion;
-
-using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Core.SmartObjects;
-
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public interface IPower
-	{
-		void PowerOn();
-		void PowerOff();
-		void PowerToggle();
-		BoolFeedback PowerIsOnFeedback { get; }
-	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public static class IPowerExtensions
-	{
-		public static void LinkButtons(this IPower dev, BasicTriList triList)
-		{
-			triList.SetSigFalseAction(101, dev.PowerOn);
-			triList.SetSigFalseAction(102, dev.PowerOff);
-			triList.SetSigFalseAction(103, dev.PowerToggle);
-			dev.PowerIsOnFeedback.LinkInputSig(triList.BooleanInput[101]);
-		}
-
-		public static void UnlinkButtons(this IPower dev, BasicTriList triList)
-		{
-			triList.ClearBoolSigAction(101);
-			triList.ClearBoolSigAction(102);
-			triList.ClearBoolSigAction(103);
-			dev.PowerIsOnFeedback.UnlinkInputSig(triList.BooleanInput[101]);
-		}
-	}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DeviceSupport;
+using Crestron.SimplSharpPro.Fusion;
+
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.SmartObjects;
+
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public interface IPower
+	{
+		void PowerOn();
+		void PowerOff();
+		void PowerToggle();
+		BoolFeedback PowerIsOnFeedback { get; }
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public static class IPowerExtensions
+	{
+		public static void LinkButtons(this IPower dev, BasicTriList triList)
+		{
+			triList.SetSigFalseAction(101, dev.PowerOn);
+			triList.SetSigFalseAction(102, dev.PowerOff);
+			triList.SetSigFalseAction(103, dev.PowerToggle);
+			dev.PowerIsOnFeedback.LinkInputSig(triList.BooleanInput[101]);
+		}
+
+		public static void UnlinkButtons(this IPower dev, BasicTriList triList)
+		{
+			triList.ClearBoolSigAction(101);
+			triList.ClearBoolSigAction(102);
+			triList.ClearBoolSigAction(103);
+			dev.PowerIsOnFeedback.UnlinkInputSig(triList.BooleanInput[101]);
+		}
+	}
 }

Essentials Core/PepperDashEssentialsBase/Devices/CodecInterfaces.cs

@@ -1,46 +1,46 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-    /// <summary>
-    /// Adds control of codec receive volume
-    /// </summary>
-    public interface IReceiveVolume
-    {
-        // Break this out into 3 interfaces
-        void SetReceiveVolume(ushort level);
-        void ReceiveMuteOn();
-        void ReceiveMuteOff();
-        void ReceiveMuteToggle();
-        IntFeedback ReceiveLevelFeedback { get; }
-        BoolFeedback ReceiveMuteIsOnFeedback { get; }
-    }
-
-    /// <summary>
-    /// Adds control of codec transmit volume
-    /// </summary>
-    public interface ITransmitVolume
-    {
-        void SetTransmitVolume(ushort level);
-        void TransmitMuteOn();
-        void TransmitMuteOff();
-        void TransmitMuteToggle();
-        IntFeedback TransmitLevelFeedback { get; }
-        BoolFeedback TransmitMuteIsOnFeedback { get; }
-    }
-
-    /// <summary>
-    /// Adds control of codec privacy function (microphone mute)
-    /// </summary>
-    public interface IPrivacy
-    {
-        void PrivacyModeOn();
-        void PrivacyModeOff();
-        void PrivacyModeToggle();
-        BoolFeedback PrivacyModeIsOnFeedback { get; }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core
+{
+    /// <summary>
+    /// Adds control of codec receive volume
+    /// </summary>
+    public interface IReceiveVolume
+    {
+        // Break this out into 3 interfaces
+        void SetReceiveVolume(ushort level);
+        void ReceiveMuteOn();
+        void ReceiveMuteOff();
+        void ReceiveMuteToggle();
+        IntFeedback ReceiveLevelFeedback { get; }
+        BoolFeedback ReceiveMuteIsOnFeedback { get; }
+    }
+
+    /// <summary>
+    /// Adds control of codec transmit volume
+    /// </summary>
+    public interface ITransmitVolume
+    {
+        void SetTransmitVolume(ushort level);
+        void TransmitMuteOn();
+        void TransmitMuteOff();
+        void TransmitMuteToggle();
+        IntFeedback TransmitLevelFeedback { get; }
+        BoolFeedback TransmitMuteIsOnFeedback { get; }
+    }
+
+    /// <summary>
+    /// Adds control of codec privacy function (microphone mute)
+    /// </summary>
+    public interface IPrivacy
+    {
+        void PrivacyModeOn();
+        void PrivacyModeOff();
+        void PrivacyModeToggle();
+        BoolFeedback PrivacyModeIsOnFeedback { get; }
+    }
 }

Essentials Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs

@@ -56,6 +56,8 @@ namespace PepperDash.Essentials.Core
 									System.Globalization.CultureInfo.InvariantCulture))
 								.ToArray();
 			object ret = method.Invoke(obj, convertedParams);
+			//Debug.Console(0, JsonConvert.SerializeObject(ret));
+			// return something?
 		}
 
 		/// <summary>

Essentials Core/PepperDashEssentialsBase/Devices/DeviceManager.cs

@@ -29,6 +29,10 @@ namespace PepperDash.Essentials.Core
 
 		public static void Initialize(CrestronControlSystem cs)
 		{
+            //CrestronConsole.AddNewConsoleCommand(ListDeviceCommands, "devcmdlist", "Lists commands", 
+            //    ConsoleAccessLevelEnum.AccessOperator);
+            //CrestronConsole.AddNewConsoleCommand(DoDeviceCommand, "devcmd", "Runs a command on device - key Name value", 
+            //    ConsoleAccessLevelEnum.AccessOperator);
 			CrestronConsole.AddNewConsoleCommand(ListDeviceCommStatuses, "devcommstatus", "Lists the communication status of all devices",
 				ConsoleAccessLevelEnum.AccessOperator);
 			CrestronConsole.AddNewConsoleCommand(ListDeviceFeedbacks, "devfb", "Lists current feedbacks", 
@@ -54,51 +58,15 @@ namespace PepperDash.Essentials.Core
 		}
 
 		/// <summary>
-		/// Calls activate steps on all Device class items
+		/// Calls activate on all Device class items
 		/// </summary>
 		public static void ActivateAll()
 		{
-            // PreActivate all devices
-            foreach (var d in Devices.Values)
-            {
-                try
-                {
-                    if (d is Device)
-                        (d as Device).PreActivate();
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(0, d, "ERROR: Device PreActivation failure:\r{0}", e);
-                }
-            }
-
-            // Activate all devices
 			foreach (var d in Devices.Values)
 			{
-				try
-				{
-					if (d is Device)
-						(d as Device).Activate();
-				}
-				catch (Exception e)
-				{
-					Debug.Console(0, d, "ERROR: Device Activation failure:\r{0}", e);
-				}
+				if (d is Device)
+					(d as Device).Activate();
 			}
-
-            // PostActivate all devices
-            foreach (var d in Devices.Values)
-            {
-                try
-                {
-                    if (d is Device)
-                        (d as Device).PostActivate();
-                }
-                catch (Exception e)
-                {
-                    Debug.Console(0, d, "ERROR: Device PostActivation failure:\r{0}", e);
-                }
-            }
 		}
 
 		/// <summary>

Essentials Core/PepperDashEssentialsBase/Devices/IHasFeedbacks_LOCAL_3692.cs

@@ -13,7 +13,7 @@ namespace PepperDash.Essentials.Core
 		/// This method shall return a list of all Output objects on a device,
 		/// including all "aggregate" devices.
 		/// </summary>
-		FeedbackCollection<Feedback> Feedbacks { get; }
+		List<Feedback> Feedbacks { get; }
 
 	}
 
@@ -55,7 +55,7 @@ namespace PepperDash.Essentials.Core
                         }
 					}
 					Debug.Console(0, "{0,-12} {1, -25} {2}", type,
-						(string.IsNullOrEmpty(f.Key) ? "-no key-" : f.Key), val);
+						(string.IsNullOrEmpty(f.Cue.Name) ? "-no name-" : f.Cue.Name), val);
 				}
 			}
 			else

Essentials Core/PepperDashEssentialsBase/Devices/IUsageTracking.cs

@@ -1,104 +1,104 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using PepperDash.Core;
-
-namespace PepperDash.Essentials.Core
-{
-    public interface IUsageTracking
-    {
-        UsageTracking UsageTracker { get; set; }
-    }
-
-    //public static class IUsageTrackingExtensions
-    //{
-    //    public static void EnableUsageTracker(this IUsageTracking device)
-    //    {
-    //        device.UsageTracker = new UsageTracking();
-    //    }
-    //}
-
-    public class UsageTracking
-    {
-        public event EventHandler<DeviceUsageEventArgs> DeviceUsageEnded;
-
-        public InUseTracking InUseTracker { get; protected set; }
-
-        public bool UsageIsTracked { get; set; }
-
-        public bool UsageTrackingStarted { get; protected set; }
-        public DateTime UsageStartTime { get; protected set; }
-        public DateTime UsageEndTime { get; protected set; }
-
-        public Device Parent { get; private set; }
-
-        public UsageTracking(Device parent)
-        {
-            Parent = parent;
-   
-            InUseTracker = new InUseTracking();
-
-            InUseTracker.InUseFeedback.OutputChange += InUseFeedback_OutputChange; //new EventHandler<EventArgs>();
-        }
-
-        void  InUseFeedback_OutputChange(object sender, EventArgs e)
-        {
- 	        if(InUseTracker.InUseFeedback.BoolValue)
-            {
-                StartDeviceUsage();
-            }
-            else
-            {
-                EndDeviceUsage();
-            }
-        }
-
-
-        /// <summary>
-        /// Stores the usage start time
-        /// </summary>
-        public void StartDeviceUsage()
-        {
-            UsageTrackingStarted = true;
-            UsageStartTime = DateTime.Now;
-        }
-
-        /// <summary>
-        /// Calculates the difference between the usage start and end times, gets the total minutes used and fires an event to pass that info to a consumer
-        /// </summary>
-        public void EndDeviceUsage()
-        {
-            try
-            {
-                UsageTrackingStarted = false;
-
-                UsageEndTime = DateTime.Now;
-
-                if (UsageStartTime != null)
-                {
-                    var timeUsed = UsageEndTime - UsageStartTime;
-
-                    var handler = DeviceUsageEnded;
-
-                    if (handler != null)
-                    {
-                        Debug.Console(1, "Device Usage Ended for: {0} at {1}.  In use for {2} minutes.", Parent.Name, UsageEndTime, timeUsed.Minutes);
-                        handler(this, new DeviceUsageEventArgs() { UsageEndTime = UsageEndTime, MinutesUsed = timeUsed.Minutes });
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                Debug.Console(1, "Error ending device usage: {0}", e);
-            }
-        }
-    }
-
-    public class DeviceUsageEventArgs : EventArgs
-    {
-        public DateTime UsageEndTime { get; set; }
-        public int MinutesUsed { get; set; }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core
+{
+    public interface IUsageTracking
+    {
+        UsageTracking UsageTracker { get; set; }
+    }
+
+    //public static class IUsageTrackingExtensions
+    //{
+    //    public static void EnableUsageTracker(this IUsageTracking device)
+    //    {
+    //        device.UsageTracker = new UsageTracking();
+    //    }
+    //}
+
+    public class UsageTracking
+    {
+        public event EventHandler<DeviceUsageEventArgs> DeviceUsageEnded;
+
+        public InUseTracking InUseTracker { get; protected set; }
+
+        public bool UsageIsTracked { get; set; }
+
+        public bool UsageTrackingStarted { get; protected set; }
+        public DateTime UsageStartTime { get; protected set; }
+        public DateTime UsageEndTime { get; protected set; }
+
+        public Device Parent { get; private set; }
+
+        public UsageTracking(Device parent)
+        {
+            Parent = parent;
+   
+            InUseTracker = new InUseTracking();
+
+            InUseTracker.InUseFeedback.OutputChange +=new EventHandler<EventArgs>(InUseFeedback_OutputChange);
+        }
+
+        void  InUseFeedback_OutputChange(object sender, EventArgs e)
+        {
+ 	        if(InUseTracker.InUseFeedback.BoolValue)
+            {
+                StartDeviceUsage();
+            }
+            else
+            {
+                EndDeviceUsage();
+            }
+        }
+
+
+        /// <summary>
+        /// Stores the usage start time
+        /// </summary>
+        public void StartDeviceUsage()
+        {
+            UsageTrackingStarted = true;
+            UsageStartTime = DateTime.Now;
+        }
+
+        /// <summary>
+        /// Calculates the difference between the usage start and end times, gets the total minutes used and fires an event to pass that info to a consumer
+        /// </summary>
+        public void EndDeviceUsage()
+        {
+            try
+            {
+                UsageTrackingStarted = false;
+
+                UsageEndTime = DateTime.Now;
+
+                if (UsageStartTime != null)
+                {
+                    var timeUsed = UsageEndTime - UsageStartTime;
+
+                    var handler = DeviceUsageEnded;
+
+                    if (handler != null)
+                    {
+                        Debug.Console(1, "Device Usage Ended for: {0} at {1}.  In use for {2} minutes.", Parent.Name, UsageEndTime, timeUsed.Minutes);
+                        handler(this, new DeviceUsageEventArgs() { UsageEndTime = UsageEndTime, MinutesUsed = timeUsed.Minutes });
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, "Error ending device usage: {0}", e);
+            }
+        }
+    }
+
+    public class DeviceUsageEventArgs : EventArgs
+    {
+        public DateTime UsageEndTime { get; set; }
+        public int MinutesUsed { get; set; }
+    }
 }

Essentials Core/PepperDashEssentialsBase/Devices/IVolumeAndAudioInterfaces.cs

@@ -1,106 +1,96 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// Defines minimal volume control methods
-	/// </summary>
-	public interface IBasicVolumeControls
-	{
-		void VolumeUp(bool pressRelease);
-		void VolumeDown(bool pressRelease);
-		void MuteToggle();
-	}
-
-	/// <summary>
-	/// Adds feedback and direct volume level set to IBasicVolumeControls
-	/// </summary>
-	public interface IBasicVolumeWithFeedback : IBasicVolumeControls
-	{
-		void SetVolume(ushort level);
-		void MuteOn();
-		void MuteOff();
-		IntFeedback VolumeLevelFeedback { get; }
-		BoolFeedback MuteFeedback { get; }
-	}
-
-    /// <summary>
-    /// A class that implements this contains a reference to a current IBasicVolumeControls device.
-    /// The class may have multiple IBasicVolumeControls.
-    /// </summary>
-    public interface IHasCurrentVolumeControls
-    {
-        IBasicVolumeControls CurrentVolumeControls { get; }
-		event EventHandler<VolumeDeviceChangeEventArgs> CurrentVolumeDeviceChange;
-	}
-
-
-	/// <summary>
-	/// 
-	/// </summary>
-	public interface IFullAudioSettings : IBasicVolumeWithFeedback
-	{
-		void SetBalance(ushort level);
-		void BalanceLeft(bool pressRelease);
-		void BalanceRight(bool pressRelease);
-
-		void SetBass(ushort level);
-		void BassUp(bool pressRelease);
-		void BassDown(bool pressRelease);
-
-		void SetTreble(ushort level);
-		void TrebleUp(bool pressRelease);
-		void TrebleDown(bool pressRelease);
-
-		bool hasMaxVolume { get; }
-		void SetMaxVolume(ushort level);
-		void MaxVolumeUp(bool pressRelease);
-		void MaxVolumeDown(bool pressRelease);
-
-		bool hasDefaultVolume { get; }
-		void SetDefaultVolume(ushort level);
-		void DefaultVolumeUp(bool pressRelease);
-		void DefaultVolumeDown(bool pressRelease);
-
-		void LoudnessToggle();
-		void MonoToggle();
-
-		BoolFeedback LoudnessFeedback { get; }
-		BoolFeedback MonoFeedback { get; }
-		IntFeedback BalanceFeedback { get; }
-		IntFeedback BassFeedback { get; }
-		IntFeedback TrebleFeedback { get; }
-		IntFeedback MaxVolumeFeedback { get; }
-		IntFeedback DefaultVolumeFeedback { get; }
-	}
-
-	/// <summary>
-	/// A class that implements this, contains a reference to an IBasicVolumeControls device.
-	/// For example, speakers attached to an audio zone.  The speakers can provide reference
-	/// to their linked volume control.
-	/// </summary>
-	public interface IHasVolumeDevice
-	{
-		IBasicVolumeControls VolumeDevice { get; }
-	}
-
-	/// <summary>
-	/// Identifies a device that contains audio zones
-	/// </summary>
-	public interface IAudioZones : IRouting
-	{
-		Dictionary<uint, IAudioZone> Zone { get; }
-	}
-
-	/// <summary>
-	/// Defines minimum functionality for an audio zone
-	/// </summary>
-	public interface IAudioZone : IBasicVolumeWithFeedback
-	{
-		void SelectInput(ushort input);
-	}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// Defines minimal volume control methods
+	/// </summary>
+	public interface IBasicVolumeControls
+	{
+		void VolumeUp(bool pressRelease);
+		void VolumeDown(bool pressRelease);
+		void MuteToggle();
+	}
+
+	/// <summary>
+	/// Adds feedback and direct volume level set to IBasicVolumeControls
+	/// </summary>
+	public interface IBasicVolumeWithFeedback : IBasicVolumeControls
+	{
+		void SetVolume(ushort level);
+		void MuteOn();
+		void MuteOff();
+		IntFeedback VolumeLevelFeedback { get; }
+		BoolFeedback MuteFeedback { get; }
+	}
+
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public interface IFullAudioSettings : IBasicVolumeWithFeedback
+	{
+		void SetBalance(ushort level);
+		void BalanceLeft(bool pressRelease);
+		void BalanceRight(bool pressRelease);
+
+		void SetBass(ushort level);
+		void BassUp(bool pressRelease);
+		void BassDown(bool pressRelease);
+
+		void SetTreble(ushort level);
+		void TrebleUp(bool pressRelease);
+		void TrebleDown(bool pressRelease);
+
+		bool hasMaxVolume { get; }
+		void SetMaxVolume(ushort level);
+		void MaxVolumeUp(bool pressRelease);
+		void MaxVolumeDown(bool pressRelease);
+
+		bool hasDefaultVolume { get; }
+		void SetDefaultVolume(ushort level);
+		void DefaultVolumeUp(bool pressRelease);
+		void DefaultVolumeDown(bool pressRelease);
+
+		void LoudnessToggle();
+		void MonoToggle();
+
+		BoolFeedback LoudnessFeedback { get; }
+		BoolFeedback MonoFeedback { get; }
+		IntFeedback BalanceFeedback { get; }
+		IntFeedback BassFeedback { get; }
+		IntFeedback TrebleFeedback { get; }
+		IntFeedback MaxVolumeFeedback { get; }
+		IntFeedback DefaultVolumeFeedback { get; }
+	}
+
+	/// <summary>
+	/// A class that implements this, contains a reference to an IBasicVolumeControls device.
+	/// For example, speakers attached to an audio zone.  The speakers can provide reference
+	/// to their linked volume control.
+	/// </summary>
+	public interface IHasVolumeDevice
+	{
+		IBasicVolumeControls VolumeDevice { get; }
+	}
+
+	/// <summary>
+	/// Identifies a device that contains audio zones
+	/// </summary>
+	public interface IAudioZones : IRouting
+	{
+		Dictionary<uint, IAudioZone> Zone { get; }
+	}
+
+	/// <summary>
+	/// Defines minimum functionality for an audio zone
+	/// </summary>
+	public interface IAudioZone : IBasicVolumeWithFeedback
+	{
+		void SelectInput(ushort input);
+	}
 }

Essentials Core/PepperDashEssentialsBase/Devices/SourceListItem.cs

@@ -5,7 +5,6 @@ using Crestron.SimplSharp.CrestronIO;
 using Crestron.SimplSharpPro;
 
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using PepperDash.Core;
 
@@ -24,9 +23,7 @@ namespace PepperDash.Essentials.Core
 	/// </summary>
 	public class SourceListItem
 	{
-		[JsonProperty("sourceKey")]
 		public string SourceKey { get; set; }
-
 		/// <summary>
 		/// Returns the source Device for this, if it exists in DeviceManager
 		/// </summary>
@@ -46,7 +43,6 @@ namespace PepperDash.Essentials.Core
 		/// Gets either the source's Name or this AlternateName property, if 
 		/// defined.  If source doesn't exist, returns "Missing source"
 		/// </summary>
-		[JsonProperty("preferredName")]
 		public string PreferredName
 		{
 			get
@@ -64,37 +60,15 @@ namespace PepperDash.Essentials.Core
 		/// <summary>
 		/// A name that will override the source's name on the UI
 		/// </summary>
-		[JsonProperty("name")]
 		public string Name { get; set; }
-
-		[JsonProperty("icon")]
 		public string Icon { get; set; }
-
-		[JsonProperty("altIcon")]
 		public string AltIcon { get; set; }
-
-		[JsonProperty("includeInSourceList")]
 		public bool IncludeInSourceList { get; set; }
-
-		[JsonProperty("order")]
-		public int Order { get; set; }
-
-		[JsonProperty("volumeControlKey")]
+        public int Order { get; set; }
 		public string VolumeControlKey { get; set; }
-
-		[JsonProperty("type")]
-		[JsonConverter(typeof(StringEnumConverter))]
 		public eSourceListItemType Type { get; set; }
-
-		[JsonProperty("routeList")]
 		public List<SourceRouteListItem> RouteList { get; set; }
 
-		[JsonProperty("disableCodecSharing")]
-		public bool DisableCodecSharing { get; set; }
-
-		[JsonProperty("disableRoutedSharing")]
-		public bool DisableRoutedSharing { get; set; }
-
 		public SourceListItem()
 		{
 			Icon = "Blank";

Essentials Core/PepperDashEssentialsBase/Display/BasicIrDisplay.cs

@@ -50,19 +50,19 @@ namespace PepperDash.Essentials.Core
 
 			InputPorts.AddRange(new RoutingPortCollection<RoutingInputPort>
 			{
-				new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
+				new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.AudioVideo, 
 					eRoutingPortConnectionType.Hdmi, new Action(Hdmi1), this, false),
-				new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
+				new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo, 
 					eRoutingPortConnectionType.Hdmi, new Action(Hdmi2), this, false),
-				new RoutingInputPort(RoutingPortNames.HdmiIn3, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
+				new RoutingInputPort(RoutingPortNames.HdmiIn3, eRoutingSignalType.AudioVideo, 
 					eRoutingPortConnectionType.Hdmi, new Action(Hdmi3), this, false),
-				new RoutingInputPort(RoutingPortNames.HdmiIn4, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
+				new RoutingInputPort(RoutingPortNames.HdmiIn4, eRoutingSignalType.AudioVideo, 
 					eRoutingPortConnectionType.Hdmi, new Action(Hdmi4), this, false),
-				new RoutingInputPort(RoutingPortNames.ComponentIn, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
+				new RoutingInputPort(RoutingPortNames.ComponentIn, eRoutingSignalType.AudioVideo, 
 					eRoutingPortConnectionType.Hdmi, new Action(Component1), this, false),
-				new RoutingInputPort(RoutingPortNames.CompositeIn, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
+				new RoutingInputPort(RoutingPortNames.CompositeIn, eRoutingSignalType.AudioVideo, 
 					eRoutingPortConnectionType.Hdmi, new Action(Video1), this, false),
-				new RoutingInputPort(RoutingPortNames.AntennaIn, eRoutingSignalType.Audio | eRoutingSignalType.Video, 
+				new RoutingInputPort(RoutingPortNames.AntennaIn, eRoutingSignalType.AudioVideo, 
 					eRoutingPortConnectionType.Hdmi, new Action(Antenna), this, false),
 			});
 		}
@@ -175,7 +175,6 @@ namespace PepperDash.Essentials.Core
 		/// <param name="inputSelector">A delegate containing the input selector method to call</param>
 		public override void ExecuteSwitch(object inputSelector)
 		{
-            Debug.Console(2, this, "Switching to input '{0}'", (inputSelector as Action).ToString());
 
 			Action finishSwitch = () =>
 				{
@@ -187,7 +186,7 @@ namespace PepperDash.Essentials.Core
 			if (!PowerIsOnFeedback.BoolValue)
 			{
 				PowerOn();
-				EventHandler<FeedbackEventArgs> oneTimer = null;
+				EventHandler<EventArgs> oneTimer = null;
 				oneTimer = (o, a) =>
 					 {
 						 if (IsWarmingUpFeedback.BoolValue) return; // Only catch done warming

Essentials Core/PepperDashEssentialsBase/Display/DisplayBase.cs

@@ -1,127 +1,127 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public abstract class DisplayBase : Device, IHasFeedback, IRoutingSinkWithSwitching, IPower, IWarmingCooling, IUsageTracking
-	{
-		public BoolFeedback PowerIsOnFeedback { get; protected set; }
-		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
-		public BoolFeedback IsWarmingUpFeedback { get; private set; }
-
-        public UsageTracking UsageTracker { get; set; }
-
-		public uint WarmupTime { get; set; }
-		public uint CooldownTime { get; set; }
-
-		/// <summary>
-		/// Bool Func that will provide a value for the PowerIsOn Output. Must be implemented
-		/// by concrete sub-classes
-		/// </summary>
-		abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }
-		abstract protected Func<bool> IsCoolingDownFeedbackFunc { get; }
-		abstract protected Func<bool> IsWarmingUpFeedbackFunc { get; }
-        
-
-		protected CTimer WarmupTimer;
-		protected CTimer CooldownTimer;
-
-		#region IRoutingInputs Members
-
-		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
-
-		#endregion
-
-		public DisplayBase(string key, string name)
-			: base(key, name)
-		{
-			PowerIsOnFeedback = new BoolFeedback("PowerOnFeedback", PowerIsOnFeedbackFunc);
-			IsCoolingDownFeedback = new BoolFeedback("IsCoolingDown", IsCoolingDownFeedbackFunc);
-			IsWarmingUpFeedback = new BoolFeedback("IsWarmingUp", IsWarmingUpFeedbackFunc);
-
-			InputPorts = new RoutingPortCollection<RoutingInputPort>();
-
-            PowerIsOnFeedback.OutputChange += PowerIsOnFeedback_OutputChange;
-		}
-
-        void PowerIsOnFeedback_OutputChange(object sender, EventArgs e)
-        {
-            if (UsageTracker != null)
-            {
-                if (PowerIsOnFeedback.BoolValue)
-                    UsageTracker.StartDeviceUsage();
-                else
-                    UsageTracker.EndDeviceUsage();
-            }
-        }
-
-		public abstract void PowerOn();
-		public abstract void PowerOff();
-		public abstract void PowerToggle();
-
-        public virtual FeedbackCollection<Feedback> Feedbacks
-		{
-			get
-			{
-                return new FeedbackCollection<Feedback>
-				{
-					PowerIsOnFeedback,
-					IsCoolingDownFeedback,
-					IsWarmingUpFeedback
-				};
-			}
-		}
-
-		public abstract void ExecuteSwitch(object selector);
-
-	}
-
-	/// <summary>
-	/// 
-	/// </summary>
-    public abstract class TwoWayDisplayBase : DisplayBase
-	{
-        public StringFeedback CurrentInputFeedback { get; private set; }
-
-        abstract protected Func<string> CurrentInputFeedbackFunc { get; }
-
-
-        public static MockDisplay DefaultDisplay
-        { 
-			get 
-			{
-				if (_DefaultDisplay == null)
-					_DefaultDisplay = new MockDisplay("default", "Default Display");
-				return _DefaultDisplay;
-			} 
-		}
-		static MockDisplay _DefaultDisplay;
-
-		public TwoWayDisplayBase(string key, string name)
-			: base(key, name)
-		{
-            CurrentInputFeedback = new StringFeedback(CurrentInputFeedbackFunc);
-
-			WarmupTime = 7000;
-			CooldownTime = 15000;
-
-            Feedbacks.Add(CurrentInputFeedback);
-
-            
-		}
-
-	}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public abstract class DisplayBase : Device, IHasFeedback, IRoutingSinkWithSwitching, IPower, IWarmingCooling, IUsageTracking
+	{
+		public BoolFeedback PowerIsOnFeedback { get; protected set; }
+		public BoolFeedback IsCoolingDownFeedback { get; protected set; }
+		public BoolFeedback IsWarmingUpFeedback { get; private set; }
+
+        public UsageTracking UsageTracker { get; set; }
+
+		public uint WarmupTime { get; set; }
+		public uint CooldownTime { get; set; }
+
+		/// <summary>
+		/// Bool Func that will provide a value for the PowerIsOn Output. Must be implemented
+		/// by concrete sub-classes
+		/// </summary>
+		abstract protected Func<bool> PowerIsOnFeedbackFunc { get; }
+		abstract protected Func<bool> IsCoolingDownFeedbackFunc { get; }
+		abstract protected Func<bool> IsWarmingUpFeedbackFunc { get; }
+        
+
+		protected CTimer WarmupTimer;
+		protected CTimer CooldownTimer;
+
+		#region IRoutingInputs Members
+
+		public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
+
+		#endregion
+
+		public DisplayBase(string key, string name)
+			: base(key, name)
+		{
+			PowerIsOnFeedback = new BoolFeedback(CommonBoolCue.PowerOnFeedback, PowerIsOnFeedbackFunc);
+			IsCoolingDownFeedback = new BoolFeedback(CommonBoolCue.IsCoolingDown, IsCoolingDownFeedbackFunc);
+			IsWarmingUpFeedback = new BoolFeedback(CommonBoolCue.IsWarmingUp, IsWarmingUpFeedbackFunc);
+
+			InputPorts = new RoutingPortCollection<RoutingInputPort>();
+
+            PowerIsOnFeedback.OutputChange += new EventHandler<EventArgs>(PowerIsOnFeedback_OutputChange);
+		}
+
+        void PowerIsOnFeedback_OutputChange(object sender, EventArgs e)
+        {
+            if (UsageTracker != null)
+            {
+                if (PowerIsOnFeedback.BoolValue)
+                    UsageTracker.StartDeviceUsage();
+                else
+                    UsageTracker.EndDeviceUsage();
+            }
+        }
+
+		public abstract void PowerOn();
+		public abstract void PowerOff();
+		public abstract void PowerToggle();
+
+		public virtual List<Feedback> Feedbacks
+		{
+			get
+			{
+				return new List<Feedback>
+				{
+					PowerIsOnFeedback,
+					IsCoolingDownFeedback,
+					IsWarmingUpFeedback
+				};
+			}
+		}
+
+		public abstract void ExecuteSwitch(object selector);
+
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+    public abstract class TwoWayDisplayBase : DisplayBase
+	{
+        public StringFeedback CurrentInputFeedback { get; private set; }
+
+        abstract protected Func<string> CurrentInputFeedbackFunc { get; }
+
+
+        public static MockDisplay DefaultDisplay
+        { 
+			get 
+			{
+				if (_DefaultDisplay == null)
+					_DefaultDisplay = new MockDisplay("default", "Default Display");
+				return _DefaultDisplay;
+			} 
+		}
+		static MockDisplay _DefaultDisplay;
+
+		public TwoWayDisplayBase(string key, string name)
+			: base(key, name)
+		{
+            CurrentInputFeedback = new StringFeedback(CurrentInputFeedbackFunc);
+
+			WarmupTime = 7000;
+			CooldownTime = 15000;
+
+            Feedbacks.Add(CurrentInputFeedback);
+
+            
+		}
+
+	}
 }

Essentials Core/PepperDashEssentialsBase/Display/MockDisplay.cs

@@ -1,178 +1,178 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-using Crestron.SimplSharpPro;
-using Crestron.SimplSharpPro.DM;
-using Crestron.SimplSharpPro.DM.Endpoints;
-using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
-
-using PepperDash.Core;
-using PepperDash.Essentials.Core.Routing;
-
-
-namespace PepperDash.Essentials.Core
-{
-	/// <summary>
-	/// 
-	/// </summary>
-	public class MockDisplay : TwoWayDisplayBase, IBasicVolumeWithFeedback
-
-	{
-		public RoutingInputPort HdmiIn1 { get; private set; }
-		public RoutingInputPort HdmiIn2 { get; private set; }
-		public RoutingInputPort HdmiIn3 { get; private set; }
-		public RoutingInputPort ComponentIn1 { get; private set; }
-		public RoutingInputPort VgaIn1 { get; private set; }
-
-		bool _PowerIsOn;
-		bool _IsWarmingUp;
-		bool _IsCoolingDown;
-
-		protected override Func<bool> PowerIsOnFeedbackFunc { get { return () => _PowerIsOn; } }
-		protected override Func<bool> IsCoolingDownFeedbackFunc { get { return () => _IsCoolingDown; } }
-		protected override Func<bool> IsWarmingUpFeedbackFunc { get { return () => _IsWarmingUp; } }
-        protected override Func<string> CurrentInputFeedbackFunc { get { return () => "Not Implemented"; } }
-
-        int VolumeHeldRepeatInterval = 200;
-        ushort VolumeInterval = 655;
-		ushort _FakeVolumeLevel = 31768;
-		bool _IsMuted;
-
-		public MockDisplay(string key, string name)
-			: base(key, name)
-		{
-			HdmiIn1 = new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-				eRoutingPortConnectionType.Hdmi, null, this);
-			HdmiIn2 = new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-				eRoutingPortConnectionType.Hdmi, null, this);
-			HdmiIn3 = new RoutingInputPort(RoutingPortNames.HdmiIn3, eRoutingSignalType.Audio | eRoutingSignalType.Video,
-				eRoutingPortConnectionType.Hdmi, null, this);
-			ComponentIn1 = new RoutingInputPort(RoutingPortNames.ComponentIn, eRoutingSignalType.Video,
-				eRoutingPortConnectionType.Component, null, this);
-			VgaIn1 = new RoutingInputPort(RoutingPortNames.VgaIn, eRoutingSignalType.Video,
-				eRoutingPortConnectionType.Composite, null, this);
-			InputPorts.AddRange(new[] { HdmiIn1, HdmiIn2, HdmiIn3, ComponentIn1, VgaIn1 });
-
-			VolumeLevelFeedback = new IntFeedback(() => { return _FakeVolumeLevel; });
-			MuteFeedback = new BoolFeedback("MuteOn", () => _IsMuted);
-		}
-
-		public override void PowerOn()
-		{
-			if (!PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
-			{
-				_IsWarmingUp = true;
-				IsWarmingUpFeedback.InvokeFireUpdate();
-				// Fake power-up cycle
-				WarmupTimer = new CTimer(o =>
-					{
-						_IsWarmingUp = false;
-						_PowerIsOn = true;
-						IsWarmingUpFeedback.InvokeFireUpdate();
-						PowerIsOnFeedback.InvokeFireUpdate();
-					}, WarmupTime);
-			}
-		}
-
-		public override void PowerOff()
-		{
-			// If a display has unreliable-power off feedback, just override this and
-			// remove this check.
-			if (PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
-			{
-				_IsCoolingDown = true;
-				_PowerIsOn = false;
-				PowerIsOnFeedback.InvokeFireUpdate();
-				IsCoolingDownFeedback.InvokeFireUpdate();
-				// Fake cool-down cycle
-				CooldownTimer = new CTimer(o =>
-					{
-						Debug.Console(2, this, "Cooldown timer ending");
-						_IsCoolingDown = false;
-						IsCoolingDownFeedback.InvokeFireUpdate();
-					}, CooldownTime);
-			}
-		}		
-		
-		public override void PowerToggle()
-		{
-			if (PowerIsOnFeedback.BoolValue && !IsWarmingUpFeedback.BoolValue)
-				PowerOff();
-			else if (!PowerIsOnFeedback.BoolValue && !IsCoolingDownFeedback.BoolValue)
-				PowerOn();
-		}
-
-		public override void ExecuteSwitch(object selector)
-		{
-			Debug.Console(2, this, "ExecuteSwitch: {0}", selector);
-		}
-
-
-
-		#region IBasicVolumeWithFeedback Members
-
-		public IntFeedback VolumeLevelFeedback { get; private set; }
-
-		public void SetVolume(ushort level)
-		{
-			_FakeVolumeLevel = level;
-			VolumeLevelFeedback.InvokeFireUpdate();
-		}
-
-		public void MuteOn()
-		{
-			_IsMuted = true;
-			MuteFeedback.InvokeFireUpdate();
-		}
-
-		public void MuteOff()
-		{
-			_IsMuted = false;
-			MuteFeedback.InvokeFireUpdate();
-		}
-
-		public BoolFeedback MuteFeedback { get; private set; }
-
-		#endregion
-
-		#region IBasicVolumeControls Members
-
-		public void VolumeUp(bool pressRelease)
-		{
-            //while (pressRelease)
-            //{
-                Debug.Console(2, this, "Volume Down {0}", pressRelease);
-                if (pressRelease)
-                {
-                    var newLevel = _FakeVolumeLevel + VolumeInterval;
-                    SetVolume((ushort)newLevel);
-                    CrestronEnvironment.Sleep(VolumeHeldRepeatInterval);
-                }
-            //}
-		}
-
-		public void VolumeDown(bool pressRelease)
-		{
-            //while (pressRelease)
-            //{
-                Debug.Console(2, this, "Volume Up {0}", pressRelease);
-                if (pressRelease)
-                {
-                    var newLevel = _FakeVolumeLevel - VolumeInterval;
-                    SetVolume((ushort)newLevel);
-                    CrestronEnvironment.Sleep(VolumeHeldRepeatInterval);
-                }
-            //}
-		}
-
-		public void MuteToggle()
-		{
-			_IsMuted = !_IsMuted;
-			MuteFeedback.InvokeFireUpdate();
-		}
-
-		#endregion
-	}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+using Crestron.SimplSharpPro.DM;
+using Crestron.SimplSharpPro.DM.Endpoints;
+using Crestron.SimplSharpPro.DM.Endpoints.Transmitters;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core.Routing;
+
+
+namespace PepperDash.Essentials.Core
+{
+	/// <summary>
+	/// 
+	/// </summary>
+	public class MockDisplay : TwoWayDisplayBase, IBasicVolumeWithFeedback
+
+	{
+		public RoutingInputPort HdmiIn1 { get; private set; }
+		public RoutingInputPort HdmiIn2 { get; private set; }
+		public RoutingInputPort HdmiIn3 { get; private set; }
+		public RoutingInputPort ComponentIn1 { get; private set; }
+		public RoutingInputPort VgaIn1 { get; private set; }
+
+		bool _PowerIsOn;
+		bool _IsWarmingUp;
+		bool _IsCoolingDown;
+
+		protected override Func<bool> PowerIsOnFeedbackFunc { get { return () => _PowerIsOn; } }
+		protected override Func<bool> IsCoolingDownFeedbackFunc { get { return () => _IsCoolingDown; } }
+		protected override Func<bool> IsWarmingUpFeedbackFunc { get { return () => _IsWarmingUp; } }
+        protected override Func<string> CurrentInputFeedbackFunc { get { return () => "Not Implemented"; } }
+
+        int VolumeHeldRepeatInterval = 200;
+        ushort VolumeInterval = 655;
+		ushort _FakeVolumeLevel = 31768;
+		bool _IsMuted;
+
+		public MockDisplay(string key, string name)
+			: base(key, name)
+		{
+			HdmiIn1 = new RoutingInputPort(RoutingPortNames.HdmiIn1, eRoutingSignalType.AudioVideo,
+				eRoutingPortConnectionType.Hdmi, null, this);
+			HdmiIn2 = new RoutingInputPort(RoutingPortNames.HdmiIn2, eRoutingSignalType.AudioVideo,
+				eRoutingPortConnectionType.Hdmi, null, this);
+			HdmiIn3 = new RoutingInputPort(RoutingPortNames.HdmiIn3, eRoutingSignalType.AudioVideo,
+				eRoutingPortConnectionType.Hdmi, null, this);
+			ComponentIn1 = new RoutingInputPort(RoutingPortNames.ComponentIn, eRoutingSignalType.Video,
+				eRoutingPortConnectionType.Component, null, this);
+			VgaIn1 = new RoutingInputPort(RoutingPortNames.VgaIn, eRoutingSignalType.Video,
+				eRoutingPortConnectionType.Composite, null, this);
+			InputPorts.AddRange(new[] { HdmiIn1, HdmiIn2, HdmiIn3, ComponentIn1, VgaIn1 });
+
+			VolumeLevelFeedback = new IntFeedback(() => { return _FakeVolumeLevel; });
+			MuteFeedback = new BoolFeedback(CommonBoolCue.MuteOn, () => _IsMuted);
+		}
+
+		public override void PowerOn()
+		{
+			if (!PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
+			{
+				_IsWarmingUp = true;
+				IsWarmingUpFeedback.FireUpdate();
+				// Fake power-up cycle
+				WarmupTimer = new CTimer(o =>
+					{
+						_IsWarmingUp = false;
+						_PowerIsOn = true;
+						IsWarmingUpFeedback.FireUpdate();
+						PowerIsOnFeedback.FireUpdate();
+					}, WarmupTime);
+			}
+		}
+
+		public override void PowerOff()
+		{
+			// If a display has unreliable-power off feedback, just override this and
+			// remove this check.
+			if (PowerIsOnFeedback.BoolValue && !_IsWarmingUp && !_IsCoolingDown)
+			{
+				_IsCoolingDown = true;
+				_PowerIsOn = false;
+				PowerIsOnFeedback.FireUpdate();
+				IsCoolingDownFeedback.FireUpdate();
+				// Fake cool-down cycle
+				CooldownTimer = new CTimer(o =>
+					{
+						Debug.Console(2, this, "Cooldown timer ending");
+						_IsCoolingDown = false;
+						IsCoolingDownFeedback.FireUpdate();
+					}, CooldownTime);
+			}
+		}		
+		
+		public override void PowerToggle()
+		{
+			if (PowerIsOnFeedback.BoolValue && !IsWarmingUpFeedback.BoolValue)
+				PowerOff();
+			else if (!PowerIsOnFeedback.BoolValue && !IsCoolingDownFeedback.BoolValue)
+				PowerOn();
+		}
+
+		public override void ExecuteSwitch(object selector)
+		{
+			Debug.Console(2, this, "ExecuteSwitch: {0}", selector);
+		}
+
+
+
+		#region IBasicVolumeWithFeedback Members
+
+		public IntFeedback VolumeLevelFeedback { get; private set; }
+
+		public void SetVolume(ushort level)
+		{
+			_FakeVolumeLevel = level; 
+			VolumeLevelFeedback.FireUpdate();
+		}
+
+		public void MuteOn()
+		{
+			_IsMuted = true;
+			MuteFeedback.FireUpdate();
+		}
+
+		public void MuteOff()
+		{
+			_IsMuted = false;
+			MuteFeedback.FireUpdate();
+		}
+
+		public BoolFeedback MuteFeedback { get; private set; }
+
+		#endregion
+
+		#region IBasicVolumeControls Members
+
+		public void VolumeUp(bool pressRelease)
+		{
+            //while (pressRelease)
+            //{
+                Debug.Console(2, this, "Volume Down {0}", pressRelease);
+                if (pressRelease)
+                {
+                    var newLevel = _FakeVolumeLevel + VolumeInterval;
+                    SetVolume((ushort)newLevel);
+                    CrestronEnvironment.Sleep(VolumeHeldRepeatInterval);
+                }
+            //}
+		}
+
+		public void VolumeDown(bool pressRelease)
+		{
+            //while (pressRelease)
+            //{
+                Debug.Console(2, this, "Volume Up {0}", pressRelease);
+                if (pressRelease)
+                {
+                    var newLevel = _FakeVolumeLevel - VolumeInterval;
+                    SetVolume((ushort)newLevel);
+                    CrestronEnvironment.Sleep(VolumeHeldRepeatInterval);
+                }
+            //}
+		}
+
+		public void MuteToggle()
+		{
+			_IsMuted = !_IsMuted;
+			MuteFeedback.FireUpdate();
+		}
+
+		#endregion
+	}
 }

Essentials Core/PepperDashEssentialsBase/Ethernet/EthernetStatistics.cs

@@ -10,23 +10,23 @@ namespace PepperDash.Essentials.Core.Ethernet
 {
 	public static class EthernetSettings
 	{
-		public static readonly BoolFeedback LinkActive = new BoolFeedback("LinkActive",
+		public static readonly BoolFeedback LinkActive = new BoolFeedback(EthernetCue.LinkActive,
 			() => true);
-		public static readonly BoolFeedback DhcpActive = new BoolFeedback("DhcpActive",
+		public static readonly BoolFeedback DhcpActive = new BoolFeedback(EthernetCue.DhcpActive,
 			() => CrestronEthernetHelper.GetEthernetParameter(
 				CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_DHCP_STATE, 0) == "ON");
 
 
-		public static readonly StringFeedback Hostname = new StringFeedback("Hostname",
+		public static readonly StringFeedback Hostname = new StringFeedback(EthernetCue.Hostname,
 			() => CrestronEthernetHelper.GetEthernetParameter(
 				CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_HOSTNAME, 0));
-		public static readonly StringFeedback IpAddress0 = new StringFeedback("IpAddress0",
+		public static readonly StringFeedback IpAddress0 = new StringFeedback(EthernetCue.IpAddress0,
 			() => CrestronEthernetHelper.GetEthernetParameter(
 				CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_ADDRESS, 0));
-		public static readonly StringFeedback SubnetMask0 = new StringFeedback("SubnetMask0",
+		public static readonly StringFeedback SubnetMask0 = new StringFeedback(EthernetCue.SubnetMask0,
 			() => CrestronEthernetHelper.GetEthernetParameter(
 				CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_IP_MASK, 0));
-		public static readonly StringFeedback DefaultGateway0 = new StringFeedback("DefaultGateway0",
+		public static readonly StringFeedback DefaultGateway0 = new StringFeedback(EthernetCue.DefaultGateway0,
 			() => CrestronEthernetHelper.GetEthernetParameter(
 				CrestronEthernetHelper.ETHERNET_PARAMETER_TO_GET.GET_CURRENT_ROUTER, 0));	
 	}

Essentials Core/PepperDashEssentialsBase/Feedbacks/Feedbacks.cs

@@ -0,0 +1,235 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using Crestron.SimplSharpPro;
+
+namespace PepperDash.Essentials.Core
+{
+	public abstract class Feedback
+	{
+		public event EventHandler<EventArgs> OutputChange;
+
+		public virtual bool BoolValue { get { return false; } }
+		public virtual int IntValue { get { return 0; } }
+		public virtual string StringValue { get { return ""; } }
+
+		public Cue Cue { get; private set; }
+
+		public abstract eCueType Type { get; }
+
+		protected Feedback()
+		{
+		}
+
+		protected Feedback(Cue cue)
+		{
+			Cue = cue;
+		}
+
+		public abstract void FireUpdate();
+
+		protected void OnOutputChange()
+		{
+			if (OutputChange != null) OutputChange(this, EventArgs.Empty);
+		}
+	}
+
+    /// <summary>
+    /// A Feedback whose output is derived from the return value of a provided Func.
+    /// </summary>
+	public class BoolFeedback : Feedback
+	{
+        /// <summary>
+        /// Returns the current value of the feedback, derived from the ValueFunc
+        /// </summary>
+        public override bool BoolValue { get { return _BoolValue; } }
+        bool _BoolValue;
+
+		public override eCueType Type { get { return eCueType.Bool; } }
+
+		public Func<bool> ValueFunc { get; private set; }
+        /// <summary>
+        /// The last value delivered on FireUpdate
+        /// </summary>
+        //public bool PreviousValue { get; private set; }
+		List<BoolInputSig> LinkedInputSigs = new List<BoolInputSig>();
+		List<BoolInputSig> LinkedComplementInputSigs = new List<BoolInputSig>();
+
+		public BoolFeedback(Func<bool> valueFunc)
+			: this(Cue.DefaultBoolCue, valueFunc)
+		{
+		}
+
+		public BoolFeedback(Cue cue, Func<bool> valueFunc)
+			: base(cue)
+		{
+			if (cue == null) throw new ArgumentNullException("cue");
+			ValueFunc = valueFunc;
+		}
+
+		public override void FireUpdate()
+		{
+            var newValue = ValueFunc.Invoke();
+            if (newValue != _BoolValue)
+            {
+                _BoolValue = newValue;
+			    LinkedInputSigs.ForEach(s => UpdateSig(s));
+			    LinkedComplementInputSigs.ForEach(s => UpdateComplementSig(s));
+			    OnOutputChange();
+            }
+		}
+
+		public void LinkInputSig(BoolInputSig sig)
+		{
+			LinkedInputSigs.Add(sig);
+			UpdateSig(sig);
+		}
+
+		public void UnlinkInputSig(BoolInputSig sig)
+		{
+			LinkedInputSigs.Remove(sig);
+		}
+
+		public void LinkComplementInputSig(BoolInputSig sig)
+		{
+			LinkedComplementInputSigs.Add(sig);
+			UpdateComplementSig(sig);
+		}
+
+		public void UnlinkComplementInputSig(BoolInputSig sig)
+		{
+			LinkedComplementInputSigs.Remove(sig);
+		}
+
+        public override string ToString()
+        {
+            return BoolValue.ToString();
+        }
+
+		void UpdateSig(BoolInputSig sig)
+		{
+			sig.BoolValue = _BoolValue;
+		}
+
+		void UpdateComplementSig(BoolInputSig sig)
+		{
+			sig.BoolValue = !_BoolValue;
+		}
+	}
+
+	//******************************************************************************
+	public class IntFeedback : Feedback
+	{
+        public override int IntValue { get { return _IntValue; } } // ValueFunc.Invoke(); } }
+        int _IntValue;
+        public ushort UShortValue { get { return (ushort)_IntValue; } }
+		public override eCueType Type { get { return eCueType.Int; } }
+        //public int PreviousValue { get; private set; }
+
+		Func<int> ValueFunc;
+		List<UShortInputSig> LinkedInputSigs = new List<UShortInputSig>();
+
+		public IntFeedback(Func<int> valueFunc)
+			: this(Cue.DefaultIntCue, valueFunc)
+		{
+		}
+
+		public IntFeedback(Cue cue, Func<int> valueFunc)
+			: base(cue)
+		{
+			if (cue == null) throw new ArgumentNullException("cue");
+			ValueFunc = valueFunc;
+		}
+
+		public override void FireUpdate()
+		{
+            var newValue = ValueFunc.Invoke();
+            if (newValue != _IntValue)
+            {
+                _IntValue = newValue;
+                LinkedInputSigs.ForEach(s => UpdateSig(s));
+                OnOutputChange();
+            }
+		}
+
+		public void LinkInputSig(UShortInputSig sig)
+		{
+			LinkedInputSigs.Add(sig);
+			UpdateSig(sig);
+		}
+
+		public void UnlinkInputSig(UShortInputSig sig)
+		{
+			LinkedInputSigs.Remove(sig);
+		}
+
+        public override string ToString()
+        {
+            return IntValue.ToString();
+        }
+
+		void UpdateSig(UShortInputSig sig)
+		{
+            sig.UShortValue = UShortValue;
+		}
+	}
+
+
+	//******************************************************************************
+	public class StringFeedback : Feedback
+	{
+        public override string StringValue { get { return _StringValue; } } // ValueFunc.Invoke(); } }
+        string _StringValue;
+		public override eCueType Type { get { return eCueType.String; } }
+        //public string PreviousValue { get; private set; }
+		public Func<string> ValueFunc { get; private set; }
+		List<StringInputSig> LinkedInputSigs = new List<StringInputSig>();
+
+		public StringFeedback(Func<string> valueFunc)
+			: this(Cue.DefaultStringCue, valueFunc)
+		{
+		}
+
+		public StringFeedback(Cue cue, Func<string> valueFunc)
+			: base(cue)
+		{
+			if (cue == null) throw new ArgumentNullException("cue");
+			ValueFunc = valueFunc;
+
+		}
+
+		public override void FireUpdate()
+		{
+            var newValue = ValueFunc.Invoke();
+            if (newValue != _StringValue)
+            {
+                _StringValue = newValue;
+                LinkedInputSigs.ForEach(s => UpdateSig(s));
+                OnOutputChange();
+            }
+		}
+
+		public void LinkInputSig(StringInputSig sig)
+		{
+			LinkedInputSigs.Add(sig);
+			UpdateSig(sig);
+		}
+
+		public void UnlinkInputSig(StringInputSig sig)
+		{
+			LinkedInputSigs.Remove(sig);
+		}
+
+        public override string ToString()
+        {
+            return StringValue;    
+        }
+
+		void UpdateSig(StringInputSig sig)
+		{
+            sig.StringValue = _StringValue;
+		}
+	}
+}

Essentials Core/PepperDashEssentialsBase/Global/Global.cs

@@ -0,0 +1,42 @@
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronDataStore;
+using Crestron.SimplSharpPro;
+
+//using PepperDash.Essentials.Core.Http;
+using PepperDash.Essentials.License;
+
+
+
+namespace PepperDash.Essentials.Core
+{
+	public static class Global
+	{
+		public static CrestronControlSystem ControlSystem { get; set; }
+
+		public static LicenseManager LicenseManager { get; set; }
+
+		//public static EssentialsHttpServer HttpConfigServer
+		//{
+		//    get
+		//    {
+		//        if (_HttpConfigServer == null)
+		//            _HttpConfigServer = new EssentialsHttpServer();
+		//        return _HttpConfigServer;
+		//    }
+		//}
+		//static EssentialsHttpServer _HttpConfigServer;
+
+
+		static Global()
+		{
+			// Fire up CrestronDataStoreStatic
+			var err = CrestronDataStoreStatic.InitCrestronDataStore();
+			if (err != CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
+			{
+				CrestronConsole.PrintLine("Error starting CrestronDataStoreStatic: {0}", err);
+				return;
+			}
+		}
+
+	}
+}

Essentials Core/PepperDashEssentialsBase/Global/JobTimer.cs

@@ -72,7 +72,6 @@ namespace PepperDash.Essentials.Core
 
 	public enum eJobTimerCycleTypes
 	{
-        RunEveryDay,
 		RunEveryHour,
 		RunEveryHalfHour,
 		RunEveryMinute

Essentials Core/PepperDashEssentialsBase/License/EssentialsLicenseManager.cs

@@ -49,7 +49,7 @@ namespace PepperDash.Essentials.License
 
 		MockEssentialsLicenseManager() : base()
 		{
-			LicenseIsValid = new BoolFeedback("LicenseIsValid",
+			LicenseIsValid = new BoolFeedback(LicenseCue.LicenseIsValid,
 				() => { return IsValid; });
 			CrestronConsole.AddNewConsoleCommand(
 				s => SetFromConsole(s.Equals("true", StringComparison.OrdinalIgnoreCase)), 

Essentials Core/PepperDashEssentialsBase/Monitoring/GenericCommunicationMonitor.cs

@@ -105,7 +105,6 @@ namespace PepperDash.Essentials.Core
 		{
 			Status = MonitorStatus.IsOk;
 			ResetErrorTimers();
-			//
 		}
 
 		void Poll()

Essentials Core/PepperDashEssentialsBase/Monitoring/Interfaces and things.cs

@@ -12,7 +12,6 @@ namespace PepperDash.Essentials.Core
 		event EventHandler<MonitorStatusChangeEventArgs> StatusChange;
 		MonitorStatus Status { get; }
 		string Message { get; }
-		BoolFeedback IsOnlineFeedback { get; set; }
 		void Start();
 		void Stop();
 	}
@@ -41,7 +40,7 @@ namespace PepperDash.Essentials.Core
 	{
 		public MonitorStatus Status { get; private set; }
 		public string Message { get; private set; }
-	
+
 		public MonitorStatusChangeEventArgs(MonitorStatus status)
 		{
 			Status = status;

Essentials Core/PepperDashEssentialsBase/Monitoring/StatusMonitorBase.cs

@@ -26,10 +26,6 @@ namespace PepperDash.Essentials.Core
 
 		public IKeyed Parent { get; private set; }
 
-		public BoolFeedback IsOnlineFeedback { get; set; }
-
-		public bool IsOnline;
-
 		public MonitorStatus Status
 		{
 			get { return _Status; }
@@ -38,7 +34,6 @@ namespace PepperDash.Essentials.Core
 				if (value != _Status)
 				{
 					_Status = value;
-					
 					OnStatusChange(value);
 				}
 			}
@@ -71,7 +66,6 @@ namespace PepperDash.Essentials.Core
 			if (warningTime < 5000 || errorTime < 5000)
 				throw new ArgumentException("time values cannot be less that 5000 ms");
 
-			IsOnlineFeedback = new BoolFeedback(() => { return IsOnline; });
 			Status = MonitorStatus.StatusUnknown;
 			WarningTime = warningTime;
 			ErrorTime = errorTime;
@@ -82,11 +76,6 @@ namespace PepperDash.Essentials.Core
 
 		protected void OnStatusChange(MonitorStatus status)
 		{
-			if (_Status == MonitorStatus.IsOk)
-				IsOnline = true;
-			else
-				IsOnline = false;
-			IsOnlineFeedback.FireUpdate();
 			var handler = StatusChange;
 			if (handler != null)
 				handler(this, new MonitorStatusChangeEventArgs(status));
@@ -94,11 +83,6 @@ namespace PepperDash.Essentials.Core
 
 		protected void OnStatusChange(MonitorStatus status, string message)
 		{
-			if (_Status == MonitorStatus.IsOk)
-				IsOnline = true;
-			else
-				IsOnline = false;
-			IsOnlineFeedback.FireUpdate();
 			var handler = StatusChange;
 			if (handler != null)
 				handler(this, new MonitorStatusChangeEventArgs(status, message));

Essentials Core/PepperDashEssentialsBase/Monitoring/StatusMonitorCollection.cs

@@ -30,7 +30,6 @@ namespace PepperDash.Essentials.Core
 
 		public string Message { get; private set; }
 
-		public BoolFeedback IsOnlineFeedback { get; set; }
 
 		public StatusMonitorCollection(IKeyed parent)
 		{

Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj

@@ -48,99 +48,67 @@
   <ItemGroup>
     <Reference Include="Crestron.SimplSharpPro.DeviceSupport, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.DM, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.EthernetCommunications, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.EthernetCommunications.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Fusion, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Fusion.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.Remotes, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Remotes.dll</HintPath>
     </Reference>
     <Reference Include="Crestron.SimplSharpPro.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
     </Reference>
     <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.1.26313, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.0.0.16459, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\references\PepperDash_Core.dll</HintPath>
+      <HintPath>..\..\..\pepperdash-simplsharp-core\Pepperdash Core\CLZ Builds\PepperDash_Core.dll</HintPath>
     </Reference>
     <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpHelperInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpNewtonsoft, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll</HintPath>
     </Reference>
-    <Reference Include="SimplSharpPro, Version=1.5.3.17, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
+    <Reference Include="SimplSharpPro, Version=1.5.0.7, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="SimplSharpReflectionInterface, Version=1.0.5583.25238, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
-    </Reference>
-    <Reference Include="SimplSharpTimerEventInterface, Version=1.0.6197.20052, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpTimerEventInterface.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Comm and IR\CecPortController.cs" />
-    <Compile Include="Comm and IR\GenericComm.cs" />
-    <Compile Include="Config\Essentials\ConfigUpdater.cs" />
-    <Compile Include="Config\Essentials\ConfigReader.cs" />
-    <Compile Include="Config\Essentials\ConfigWriter.cs" />
-    <Compile Include="Config\Essentials\EssentialsConfig.cs" />
-    <Compile Include="Config\SourceDevicePropertiesConfigBase.cs" />
-    <Compile Include="Crestron IO\Inputs\GenericDigitalInputDevice.cs" />
-    <Compile Include="Crestron IO\Inputs\GenericVersiportInputDevice.cs" />
-    <Compile Include="Crestron IO\Inputs\IDigitalInput.cs" />
-    <Compile Include="Crestron IO\IOPortConfig.cs" />
-    <Compile Include="Crestron IO\Relay\GenericRelayDevice.cs" />
-    <Compile Include="Crestron IO\Relay\ISwitchedOutput.cs" />
     <Compile Include="Devices\CodecInterfaces.cs" />
-    <Compile Include="Devices\CrestronProcessor.cs" />
-    <Compile Include="Devices\DeviceApiBase.cs" />
-    <Compile Include="Devices\ReconfigurableDevice.cs" />
-    <Compile Include="Devices\VolumeDeviceChangeEventArgs.cs" />
-    <Compile Include="Factory\DeviceFactory.cs" />
-    <Compile Include="Feedbacks\BoolFeedback.cs" />
-    <Compile Include="Feedbacks\FeedbackCollection.cs" />
-    <Compile Include="Feedbacks\FeedbackEventArgs.cs" />
-    <Compile Include="Feedbacks\IntFeedback.cs" />
-    <Compile Include="Feedbacks\SerialFeedback.cs" />
-    <Compile Include="Feedbacks\StringFeedback.cs" />
     <Compile Include="Global\JobTimer.cs" />
-    <Compile Include="Global\Scheduler.cs" />
-    <Compile Include="JoinMaps\JoinMapBase.cs" />
-    <Compile Include="Lighting\Lighting Interfaces.cs" />
-    <Compile Include="Lighting\LightingBase.cs" />
-    <Compile Include="Monitoring\SystemMonitorController.cs" />
     <Compile Include="Ramps and Increments\ActionIncrementer.cs" />
     <Compile Include="Comm and IR\CommFactory.cs" />
     <Compile Include="Comm and IR\CommunicationExtras.cs" />
+    <Compile Include="Comm and IR\REMOVE ComPortConfig.cs" />
     <Compile Include="Comm and IR\ComSpecJsonConverter.cs" />
     <Compile Include="Comm and IR\ConsoleCommMockDevice.cs" />
     <Compile Include="Comm and IR\IRPortHelper.cs" />
@@ -206,9 +174,6 @@
     <Compile Include="Feedbacks\BoolFeedbackPulseExtender.cs" />
     <Compile Include="Routing\RoutingPortNames.cs" />
     <Compile Include="Routing\TieLineConfig.cs" />
-    <Compile Include="Shades\Shade Interfaces.cs" />
-    <Compile Include="Shades\ShadeBase.cs" />
-    <Compile Include="Shades\ShadeController.cs" />
     <Compile Include="SmartObjects\SmartObjectNumeric.cs" />
     <Compile Include="SmartObjects\SmartObjectDynamicList.cs" />
     <Compile Include="SmartObjects\SmartObjectDPad.cs" />
@@ -216,7 +181,6 @@
     <Compile Include="SmartObjects\SmartObjectHelperBase.cs" />
     <Compile Include="Routing\TieLine.cs" />
     <Compile Include="Timers\CountdownTimer.cs" />
-    <Compile Include="Touchpanels\CrestronTouchpanelPropertiesConfig.cs" />
     <Compile Include="Touchpanels\Keyboards\HabaneroKeyboardController.cs" />
     <Compile Include="Touchpanels\MOVED LargeTouchpanelControllerBase.cs" />
     <Compile Include="Touchpanels\TriListExtensions.cs" />
@@ -231,11 +195,12 @@
     <Compile Include="Cues and DevAction\Cues.cs" />
     <Compile Include="Comm and IR\ComPortController.cs" />
     <Compile Include="Crestron\CrestronGenericBaseDevice.cs" />
+    <Compile Include="Debug\Debug.cs" />
     <Compile Include="DeviceControlsParentInterfaces\IPresentationSource.cs" />
     <Compile Include="Devices\DeviceManager.cs" />
     <Compile Include="Devices\IrOutputPortController.cs" />
     <Compile Include="Display\DisplayBase.cs" />
-    <Compile Include="Feedbacks\FeedbackBase.cs" />
+    <Compile Include="Feedbacks\Feedbacks.cs" />
     <Compile Include="Room\Room.cs" />
     <Compile Include="Room\RoomCues.cs" />
     <Compile Include="Room\MOVED RoomEventArgs.cs" />

Essentials Core/PepperDashEssentialsBase/Properties/AssemblyInfo.cs

@@ -0,0 +1,8 @@
+using System.Reflection;
+
+[assembly: AssemblyTitle("PepperDashEssentialsBase")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PepperDashEssentialsBase")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyVersion("1.0.0.*")]
+