Updates to PD.Core 1.0.37. Adds IStreamDebugging to ComPortController and adds console command to set levels

essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/ComPortController.cs

@@ -11,8 +11,10 @@ using PepperDash.Core;
 
 namespace PepperDash.Essentials.Core
 {
-	public class ComPortController : Device, IBasicCommunication
+	public class ComPortController : Device, IBasicCommunicationWithStreamDebugging
 	{
+        public CommunicationStreamDebugging StreamDebugging { get; private set; }
+
 		public event EventHandler<GenericCommMethodReceiveBytesArgs> BytesReceived;
 		public event EventHandler<GenericCommMethodReceiveTextArgs> TextReceived;
 
@@ -24,6 +26,8 @@ namespace PepperDash.Essentials.Core
 	    public ComPortController(string key, Func<EssentialsControlPropertiesConfig, ComPort> postActivationFunc,
 	        ComPort.ComPortSpec spec, EssentialsControlPropertiesConfig config) : base(key)
 	    {
+            StreamDebugging = new CommunicationStreamDebugging(key);
+
 	        Spec = spec;
 
             AddPostActivationAction(() =>
@@ -91,7 +95,12 @@ namespace PepperDash.Essentials.Core
             }
             var textHandler = TextReceived;
             if (textHandler != null)
+            {
+                if (StreamDebugging.RxStreamDebuggingIsEnabled)
+                    Debug.Console(0, this, "Recevied: '{0}'", s);
+
                 textHandler(this, new GenericCommMethodReceiveTextArgs(s));
+            }
         }
 
 		public override bool Deactivate()
@@ -105,7 +114,10 @@ namespace PepperDash.Essentials.Core
 		{
 			if (Port == null)
 				return;
-			Port.Send(text);
+
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} characters of text: '{1}'", text.Length, text);
+            Port.Send(text);
 		}
 
 		public void SendBytes(byte[] bytes)
@@ -113,6 +125,9 @@ namespace PepperDash.Essentials.Core
 			if (Port == null)
 				return;
 			var text = Encoding.GetEncoding(28591).GetString(bytes, 0, bytes.Length);
+            if (StreamDebugging.TxStreamDebuggingIsEnabled)
+                Debug.Console(0, this, "Sending {0} bytes: '{1}'", bytes.Length, ComTextHelper.GetEscapedText(bytes));
+
 			Port.Send(text);
 		}
 

essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/DeviceManager.cs

@@ -43,6 +43,8 @@ namespace PepperDash.Essentials.Core
 			CrestronConsole.AddNewConsoleCommand(s => CrestronConsole.ConsoleCommandResponse(DeviceJsonApi.GetApiMethods(s)), "apimethods", "", ConsoleAccessLevelEnum.AccessOperator);
             CrestronConsole.AddNewConsoleCommand(SimulateComReceiveOnDevice, "devsimreceive",
                 "Simulates incoming data on a com device", ConsoleAccessLevelEnum.AccessOperator);
+
+            CrestronConsole.AddNewConsoleCommand(s => SetDeviceStreamDebugging(s), "setdevicestreamdebug", "set comm debug [deviceKey] [off/rx/tx/both] ([minutes])", ConsoleAccessLevelEnum.AccessOperator);
 		}
 
 		/// <summary>
@@ -299,5 +301,61 @@ namespace PepperDash.Essentials.Core
             }
             com.SimulateReceive(match.Groups[2].Value);
         }
+
+        /// <summary>
+        /// Attempts to set the debug level of a device
+        /// </summary>
+        /// <param name="s"></param>
+        public static void SetDeviceStreamDebugging(string s)
+        {
+            var args = s.Split(' ');
+
+            var deviceKey = args[0];
+            var setting = args[1];
+            var timeout = args[2];
+
+            var device = GetDeviceForKey(deviceKey) as IStreamDebugging;
+
+            if (device == null)
+            {
+                Debug.Console(0, "Unable to get device with key: {0}", deviceKey);
+                return;
+            }
+            else
+            {
+                eStreamDebuggingSetting debugSetting = eStreamDebuggingSetting.Off;
+
+                try
+                {
+                    debugSetting = (eStreamDebuggingSetting)Enum.Parse(typeof(eStreamDebuggingSetting), setting, true);
+                }
+                catch
+                {
+                    Debug.Console(0, "Unable to convert setting value.  Please use off/rx/tx/both");
+                    return;
+                }
+
+                if (!string.IsNullOrEmpty(timeout))
+                {
+                    try
+                    {
+                        var min = Convert.ToUInt32(timeout);
+
+                        device.StreamDebugging.SetDebuggingWithSpecificTimeout(debugSetting, min);
+
+                    }
+                    catch (Exception e)
+                    {
+                        Debug.Console(0, "Unable to convert minutes or settings value.  Please use an integer value for minutes");
+                        return;
+                    }
+                }
+                else
+                {
+                    device.StreamDebugging.SetDebuggingWithDefaultTimeout(debugSetting);
+                }
+                
+            }
+        }
 	}
 }