Merge pull request #547 from PepperDash/feature/merge-into-dev

Feature/merge into dev
Merge branch 'development' into feature/merge-into-dev
2026-01-29 04:15:00 +00:00 · 2021-01-13 09:14:23 -07:00 · 2021-01-13 08:28:15 -07:00 · 2021-01-12 16:57:43 -07:00 · 2021-01-12 16:56:12 -07:00 · 2021-01-12 15:49:18 -07:00
7 changed files with 51 additions and 14 deletions
--- a/Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs
+++ b/Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs
@@ -83,13 +83,13 @@ namespace PepperDash.Essentials.Core
        /// <returns></returns>
        public static object GetPropertyByName(string deviceObjectPath, string propertyName)
        {
-            var obj = FindObjectOnPath(deviceObjectPath);
-            if(obj == null)
+            var dev = FindObjectOnPath(deviceObjectPath);
+            if(dev == null)
                return "{ \"error\":\"No Device\"}";
+	
+            object prop = dev.GetType().GetCType().GetProperty(propertyName).GetValue(dev, null);

-            CType t = obj.GetType();
-
-            var prop = t.GetProperty(propertyName);
+            // var prop = t.GetProperty(propertyName);
            if (prop != null)
            {
                return prop;
--- a/Core/PepperDashEssentialsBase/Devices/DeviceManager.cs
+++ b/Core/PepperDashEssentialsBase/Devices/DeviceManager.cs
@@ -360,9 +360,9 @@ namespace PepperDash.Essentials.Core
 	    {
 	        var device = GetDeviceForKey(s);

-	        if (device == null) return;
-	        var inputPorts = (device as IRoutingInputsOutputs).InputPorts;
-	        var outputPorts = (device as IRoutingInputsOutputs).OutputPorts;
+            if (device == null) return;
+            var inputPorts = ((device as IRoutingInputs) != null) ? (device as IRoutingInputs).InputPorts : null;
+            var outputPorts = ((device as IRoutingOutputs) != null) ? (device as IRoutingOutputs).OutputPorts : null;
 	        if (inputPorts != null)
 	        {
 	            Debug.Console(0, "Device {0} has {1} Input Ports:", s, inputPorts.Count);
--- a/Core/PepperDashEssentialsBase/Interfaces/ILogStrings.cs
+++ b/Core/PepperDashEssentialsBase/Interfaces/ILogStrings.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+	public interface ILogStrings : IKeyed
+	{
+		/// <summary>
+		/// Defines a class that is capable of logging a string
+		/// </summary>
+		void SendToLog(IKeyed device, string logMessage);
+	}
+}
--- a/Core/PepperDashEssentialsBase/Interfaces/ILogStringsWithLevel.cs
+++ b/Core/PepperDashEssentialsBase/Interfaces/ILogStringsWithLevel.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+using PepperDash.Core;
+
+namespace PepperDash.Essentials.Core.Interfaces
+{
+	public interface ILogStringsWithLevel : IKeyed
+	{
+		/// <summary>
+		/// Defines a class that is capable of logging a string with an int level
+		/// </summary>
+		void SendToLog(IKeyed device, Debug.ErrorLogLevel level,string logMessage);
+	}
+
+}
--- a/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
+++ b/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
@@ -224,6 +224,8 @@
    <Compile Include="Gateways\CenRfgwController.cs" />
    <Compile Include="Gateways\EssentialsRfGatewayConfig.cs" />
    <Compile Include="Global\EthernetAdapterInfo.cs" />
+    <Compile Include="Interfaces\ILogStrings.cs" />
+    <Compile Include="Interfaces\ILogStringsWithLevel.cs" />
    <Compile Include="Queues\ComsMessage.cs" />
    <Compile Include="Queues\ProcessStringMessage.cs" />
    <Compile Include="Queues\GenericQueue.cs" />
--- a/DM/Essentials_DM/PepperDash_Essentials_DM.csproj
+++ b/DM/Essentials_DM/PepperDash_Essentials_DM.csproj
@@ -65,12 +65,12 @@
    </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">
@@ -79,7 +79,7 @@
    </Reference>
    <Reference Include="SimplSharpPro, Version=1.5.3.17, 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">
--- a/essentials-framework/Essentials
+++ b/essentials-framework/Essentials
@@ -69,12 +69,12 @@
    </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">
@@ -83,7 +83,7 @@
    </Reference>
    <Reference Include="SimplSharpPro, Version=1.5.3.17, 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">
Author	SHA1	Message	Date
Andrew Welker	6dbe1b6f31	Merge pull request #547 from PepperDash/feature/merge-into-dev Feature/merge into dev	2021-01-13 09:14:23 -07:00
Andrew Welker	e15ed3c77f	Merge branch 'development' into feature/merge-into-dev	2021-01-13 08:28:15 -07:00
Neil Dorin	435879e19b	Merge pull request #541 from batourin/development [BUG] Add safety check for casting device into interface	2021-01-12 16:57:43 -07:00
Neil Dorin	17ccaecf5e	Merge pull request #534 from PepperDash/feature/get-prop-by-name-fixes Feature/get prop by name fixes	2021-01-12 16:56:12 -07:00
Neil Dorin	684b8db546	Merge branch 'development' into feature/get-prop-by-name-fixes	2021-01-12 15:49:18 -07:00
Neil Dorin	14991bce95	Merge pull request #544 from PepperDash/release/1.7.0 Release/1.7.0	2021-01-12 11:04:50 -07:00
Maxim Batourine	08fe408dc1	Add safety check for casting device into interface (device as IRoutingInputsOutputs).InputPorts will throw Exception on accessing InputPorts property if device do not implement such interface.	2021-01-07 19:31:24 -05:00
Jason Alborough	0a34f48e0a	Fixes for the static GetPropertyByName method in DeviceJsonApi...now returns a property object rather than a PropertyInfo object	2020-12-18 17:07:20 -05:00
Jason Alborough	fc91ba7c1e	Fixes Namespace and Implements IKeyed in both interfaces.	2020-12-16 15:00:30 -05:00
Jason Alborough	1cad1976ee	#499 Adds interfaces ILogStrings and ILogStringsWithLevel to PepperDash_Essentials_Core.Interfaces	2020-12-16 14:39:53 -05:00