Merge pull request #1331 from PepperDash/dev-list-fix

src/PepperDash.Essentials.Core/Bridges/BridgeBase.cs

@@ -2,14 +2,12 @@
 
 using System;
 using System.Collections.Generic;
-using Crestron.SimplSharp;
 using System.Reflection;
+using Crestron.SimplSharp;
 using Crestron.SimplSharpPro;
 using Crestron.SimplSharpPro.DeviceSupport;
 using Crestron.SimplSharpPro.EthernetCommunication;
-
 using Newtonsoft.Json;
-
 using PepperDash.Core;
 using PepperDash.Essentials.Core.Config;
 using Serilog.Events;
@@ -355,22 +353,22 @@ namespace PepperDash.Essentials.Core.Bridges
     /// </summary>
     public class EiscApiPropertiesConfig
     {
-        [JsonProperty("control")]
         /// <summary>
         /// Gets or sets the Control
         /// </summary>
+        [JsonProperty("control")]
         public EssentialsControlPropertiesConfig Control { get; set; }
 
-        [JsonProperty("devices")]
         /// <summary>
         /// Gets or sets the Devices
         /// </summary>
+        [JsonProperty("devices")]
         public List<ApiDevicePropertiesConfig> Devices { get; set; }
 
-        [JsonProperty("rooms")]
         /// <summary>
         /// Gets or sets the Rooms
         /// </summary>
+        [JsonProperty("rooms")]
         public List<ApiRoomPropertiesConfig> Rooms { get; set; }
 
 
@@ -379,22 +377,22 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public class ApiDevicePropertiesConfig
         {
-            [JsonProperty("deviceKey")]
             /// <summary>
             /// Gets or sets the DeviceKey
             /// </summary>
+            [JsonProperty("deviceKey")]
             public string DeviceKey { get; set; }
 
-            [JsonProperty("joinStart")]
             /// <summary>
             /// Gets or sets the JoinStart
             /// </summary>
+            [JsonProperty("joinStart")]
             public uint JoinStart { get; set; }
 
-            [JsonProperty("joinMapKey")]
             /// <summary>
             /// Gets or sets the JoinMapKey
             /// </summary>
+            [JsonProperty("joinMapKey")]
             public string JoinMapKey { get; set; }
         }
 
@@ -403,22 +401,22 @@ namespace PepperDash.Essentials.Core.Bridges
         /// </summary>
         public class ApiRoomPropertiesConfig
         {
-            [JsonProperty("roomKey")]
             /// <summary>
             /// Gets or sets the RoomKey
             /// </summary>
+            [JsonProperty("roomKey")]
             public string RoomKey { get; set; }
 
-            [JsonProperty("joinStart")]
             /// <summary>
             /// Gets or sets the JoinStart
             /// </summary>
+            [JsonProperty("joinStart")]
             public uint JoinStart { get; set; }
 
-            [JsonProperty("joinMapKey")]
             /// <summary>
             /// Gets or sets the JoinMapKey
             /// </summary>
+            [JsonProperty("joinMapKey")]
             public string JoinMapKey { get; set; }
         }
 

src/PepperDash.Essentials.Core/Config/DeviceConfig.cs

@@ -18,41 +18,41 @@ namespace PepperDash.Essentials.Core.Config
     /// </summary>
     public class DeviceConfig
     {
-        [JsonProperty("key")]
         /// <summary>
         /// Gets or sets the Key
         /// </summary>
+        [JsonProperty("key")]
         public string Key { get; set; }
 
-        [JsonProperty("uid")]
         /// <summary>
         /// Gets or sets the Uid
         /// </summary>
+        [JsonProperty("uid")]
         public int Uid { get; set; }
 
-        [JsonProperty("name")]
         /// <summary>
         /// Gets or sets the Name
         /// </summary>
+        [JsonProperty("name")]
         public string Name { get; set; }
 
-        [JsonProperty("group")]
         /// <summary>
         /// Gets or sets the Group
         /// </summary>
+        [JsonProperty("group")]
         public string Group { get; set; }
 
-        [JsonProperty("type")]
         /// <summary>
         /// Gets or sets the Type
         /// </summary>
+        [JsonProperty("type")]
         public string Type { get; set; }
 
-        [JsonProperty("properties")]
-        [JsonConverter(typeof(DevicePropertiesConverter))]
         /// <summary>
         /// Gets or sets the Properties
         /// </summary>
+        [JsonProperty("properties")]
+        [JsonConverter(typeof(DevicePropertiesConverter))]
         public JToken Properties { get; set; }
 
         public DeviceConfig(DeviceConfig dc)

src/PepperDash.Essentials.Core/Devices/DeviceManager.cs

@@ -202,7 +202,7 @@ namespace PepperDash.Essentials.Core
 
         private static void ListDevices(string s)
         {
-            CrestronConsole.ConsoleCommandResponse($"{Devices.Count} Devices registered with Device Manager:");
+            CrestronConsole.ConsoleCommandResponse($"{Devices.Count} Devices registered with Device Manager:\r\n");
 
             var sorted = Devices.Values.ToList();
             sorted.Sort((a, b) => a.Key.CompareTo(b.Key));
@@ -210,7 +210,7 @@ namespace PepperDash.Essentials.Core
             foreach (var d in sorted)
             {
                 var name = d is IKeyName ? (d as IKeyName).Name : "---";
-                CrestronConsole.ConsoleCommandResponse($"  [{d.Key}] {name}");
+                CrestronConsole.ConsoleCommandResponse($"  [{d.Key}] {name}\r\n");
             }
         }
 
@@ -219,28 +219,17 @@ namespace PepperDash.Essentials.Core
             var dev = GetDeviceForKey(devKey);
             if (dev == null)
             {
-                Debug.LogMessage(LogEventLevel.Information, "Device '{0}' not found", devKey);
+                CrestronConsole.ConsoleCommandResponse($"Device '{devKey}' not found\r\n");
                 return;
             }
             if (!(dev is IHasFeedback statusDev))
             {
-                Debug.LogMessage(LogEventLevel.Information, "Device '{0}' does not have visible feedbacks", devKey);
+                CrestronConsole.ConsoleCommandResponse($"Device '{devKey}' does not have visible feedbacks\r\n");
                 return;
             }
             statusDev.DumpFeedbacksToConsole(true);
         }
 
-        //static void ListDeviceCommands(string devKey)
-        //{
-        //    var dev = GetDeviceForKey(devKey);
-        //    if (dev == null)
-        //    {
-        //        Debug.LogMessage(LogEventLevel.Information, "Device '{0}' not found", devKey);
-        //        return;
-        //    }
-        //    Debug.LogMessage(LogEventLevel.Information, "This needs to be reworked.  Stay tuned.", devKey);
-        //}
-
         private static void ListDeviceCommStatuses(string input)
         {
 
@@ -250,12 +239,6 @@ namespace PepperDash.Essentials.Core
             }
         }
 
-
-        //static void DoDeviceCommand(string command)
-        //{
-        //    Debug.LogMessage(LogEventLevel.Information, "Not yet implemented.  Stay tuned");
-        //}
-
         /// <summary>
         /// AddDevice method
         /// </summary>

src/PepperDash.Essentials.Core/Devices/IHasFeedbacks.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Linq;
-
+using Crestron.SimplSharp;
 using PepperDash.Core;
 using Serilog.Events;
 
@@ -19,47 +19,72 @@ namespace PepperDash.Essentials.Core
 
 	}
 
-
+	/// <summary>
+	/// Extension methods for IHasFeedback
+	/// </summary>
 	public static class IHasFeedbackExtensions
 	{
+		/// <summary>
+		/// Gets the feedback type name for sorting purposes
+		/// </summary>
+		/// <param name="feedback">The feedback to get the type name for</param>
+		/// <returns>A string representing the feedback type</returns>
+		private static string GetFeedbackTypeName(Feedback feedback)
+		{
+			if (feedback is BoolFeedback)
+				return "boolean";
+			else if (feedback is IntFeedback)
+				return "integer";
+			else if (feedback is StringFeedback)
+				return "string";
+			else
+				return feedback.GetType().Name;
+		}
+
+		/// <summary>
+		/// Dumps the feedbacks to the console
+		/// </summary>
+		/// <param name="source"></param>
+		/// <param name="getCurrentStates"></param>
 		public static void DumpFeedbacksToConsole(this IHasFeedback source, bool getCurrentStates)
 		{
-            Type t = source.GetType();
-            // get the properties and set them into a new collection of NameType wrappers
-            var props = t.GetProperties().Select(p => new PropertyNameType(p, t));
-
 			var feedbacks = source.Feedbacks;
-			if (feedbacks != null)
+
+			if (feedbacks == null || feedbacks.Count == 0)
 			{
-				Debug.LogMessage(LogEventLevel.Information, source, "\n\nAvailable feedbacks:");
+				CrestronConsole.ConsoleCommandResponse("No available feedbacks\r\n");
-				foreach (var f in feedbacks)
+				return;
+			}
+
+			CrestronConsole.ConsoleCommandResponse("Available feedbacks:\r\n");
+
+			// Sort feedbacks by type first, then by key
+			var sortedFeedbacks = feedbacks.OrderBy(f => GetFeedbackTypeName(f)).ThenBy(f => string.IsNullOrEmpty(f.Key) ? "" : f.Key);
+
+			foreach (var feedback in sortedFeedbacks)
 			{
-					string val = "";
+				string value = "";
 				string type = "";
 				if (getCurrentStates)
 				{
-                        if (f is BoolFeedback)
+					if (feedback is BoolFeedback)
 					{
-                            val = f.BoolValue.ToString();
+						value = feedback.BoolValue.ToString();
 						type = "boolean";
 					}
-                        else if (f is IntFeedback)
+					else if (feedback is IntFeedback)
 					{
-                            val = f.IntValue.ToString();
+						value = feedback.IntValue.ToString();
 						type = "integer";
 					}
-                        else if (f is StringFeedback)
+					else if (feedback is StringFeedback)
 					{
-                            val = f.StringValue;
+						value = feedback.StringValue;
 						type = "string";
 					}
 				}
-					Debug.LogMessage(LogEventLevel.Information, "{0,-12} {1, -25} {2}", type,
+				CrestronConsole.ConsoleCommandResponse($"  {type,-12} {(string.IsNullOrEmpty(feedback.Key) ? "-no key-" : feedback.Key),-25} {value}\r\n");
-						(string.IsNullOrEmpty(f.Key) ? "-no key-" : f.Key), val);
+			}
-				}
-			}
-			else
-				Debug.LogMessage(LogEventLevel.Information, source, "No available outputs:");
 		}
 	}
 }

src/PepperDash.Essentials.Core/Room/Config/EssentialsRoomConfig.cs

@@ -114,16 +114,16 @@ namespace PepperDash.Essentials.Room.Config
         [JsonProperty("emergency")]
         public EssentialsRoomEmergencyConfig Emergency { get; set; }
 
-		[JsonProperty("help")]
         /// <summary>
         /// Gets or sets the Help
         /// </summary>
+        [JsonProperty("help")]
         public EssentialsHelpPropertiesConfig Help { get; set; }
 
-		[JsonProperty("helpMessage")]
         /// <summary>
         /// Gets or sets the HelpMessage
         /// </summary>
+        [JsonProperty("helpMessage")]
         public string HelpMessage { get; set; }
 
         /// <summary>
@@ -144,82 +144,82 @@ namespace PepperDash.Essentials.Room.Config
             }
         }
 
-		[JsonProperty("environment")]
         /// <summary>
         /// Gets or sets the Environment
         /// </summary>
+        [JsonProperty("environment")]
         public EssentialsEnvironmentPropertiesConfig Environment { get; set; }
 
-		[JsonProperty("logo")]
         /// <summary>
         /// Gets or sets the LogoLight
         /// </summary>
+        [JsonProperty("logo")]
         public EssentialsLogoPropertiesConfig LogoLight { get; set; }
 
-        [JsonProperty("logoDark")]
         /// <summary>
         /// Gets or sets the LogoDark
         /// </summary>
+        [JsonProperty("logoDark")]
         public EssentialsLogoPropertiesConfig LogoDark { get; set; }
 
-		[JsonProperty("microphonePrivacy")]
         /// <summary>
         /// Gets or sets the MicrophonePrivacy
         /// </summary>
+        [JsonProperty("microphonePrivacy")]
         public EssentialsRoomMicrophonePrivacyConfig MicrophonePrivacy { get; set; }
 
-		[JsonProperty("occupancy")]
         /// <summary>
         /// Gets or sets the Occupancy
         /// </summary>
+        [JsonProperty("occupancy")]
         public EssentialsRoomOccSensorConfig Occupancy { get; set; }
 
-		[JsonProperty("oneButtonMeeting")]
         /// <summary>
         /// Gets or sets the OneButtonMeeting
         /// </summary>
+        [JsonProperty("oneButtonMeeting")]
         public EssentialsOneButtonMeetingPropertiesConfig OneButtonMeeting { get; set; }
 
-		[JsonProperty("shutdownVacancySeconds")]
         /// <summary>
         /// Gets or sets the ShutdownVacancySeconds
         /// </summary>
+        [JsonProperty("shutdownVacancySeconds")]
         public int ShutdownVacancySeconds { get; set; }
 
-		[JsonProperty("shutdownPromptSeconds")]
         /// <summary>
         /// Gets or sets the ShutdownPromptSeconds
         /// </summary>
+        [JsonProperty("shutdownPromptSeconds")]
         public int ShutdownPromptSeconds { get; set; }
 
-		[JsonProperty("tech")]
         /// <summary>
         /// Gets or sets the Tech
         /// </summary>
+        [JsonProperty("tech")]
         public EssentialsRoomTechConfig Tech { get; set; }
 
-		[JsonProperty("volumes")]
         /// <summary>
         /// Gets or sets the Volumes
         /// </summary>
+        [JsonProperty("volumes")]
         public EssentialsRoomVolumesConfig Volumes { get; set; }
 
-        [JsonProperty("fusion")]
         /// <summary>
         /// Gets or sets the Fusion
         /// </summary>
+        [JsonProperty("fusion")]
         public EssentialsRoomFusionConfig Fusion { get; set; }
 
-        [JsonProperty("essentialsRoomUiBehaviorConfig", NullValueHandling=NullValueHandling.Ignore)]
         /// <summary>
         /// Gets or sets the UiBehavior
         /// </summary>
+        [JsonProperty("essentialsRoomUiBehaviorConfig", NullValueHandling = NullValueHandling.Ignore)]
         public EssentialsRoomUiBehaviorConfig UiBehavior { get; set; }
 
-		[JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
         /// <summary>
         /// Gets or sets the ZeroVolumeWhenSwtichingVolumeDevices
         /// </summary>
+        [JsonProperty("zeroVolumeWhenSwtichingVolumeDevices")]
         public bool ZeroVolumeWhenSwtichingVolumeDevices { get; set; }
 
         /// <summary>

src/PepperDash.Essentials.Core/SmartObjects/SubpageReferencList/SubpageReferenceList.cs

@@ -15,9 +15,9 @@ using Serilog.Events;
 namespace PepperDash.Essentials.Core
 {
 	////*****************************************************************************
-    /// <summary>
+	///// <summary>
-    /// Base class for all subpage reference list controllers
+	///// Base class for all subpage reference list controllers
-    /// </summary>
+	///// </summary>
 	//public class SubpageReferenceListController
 	//{
 	//    public SubpageReferenceList TheList { get; protected set; }

src/PepperDash.Essentials.Core/Touchpanels/ModalDialog.cs

@@ -44,9 +44,9 @@ namespace PepperDash.Essentials.Core
 		/// </summary>
 		public const uint ModalVisibleJoin = 3999;
 
-		/// <summary>
+		///// <summary>
-		/// The seconds value of the countdown timer. Ushort join 3991
+		///// The seconds value of the countdown timer. Ushort join 3991
-		/// </summary>
+		///// </summary>
 		//public const uint TimerSecondsJoin = 3991;
 		/// <summary>
 		/// The full ushort value of the countdown timer for a gauge. Ushort join 3992