Merge branch 'development' into feature/add-hdbasettx-support

Merge pull request #555 from PepperDash/hotfix/videocodecbase-incoming-call-popup
Hotfix/videocodecbase incoming call popup
2026-01-24 01:45:07 +00:00 · 2021-01-20 17:06:20 -07:00 · 2021-01-20 14:52:05 -07:00 · 2021-01-20 14:33:01 -07:00 · 2021-01-18 15:28:09 -07:00 · 2021-01-18 15:37:39 -06:00
10 changed files with 190 additions and 35 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/Endpoints/Transmitters/DmTxHelpers.cs
+++ b/DM/Essentials_DM/Endpoints/Transmitters/DmTxHelpers.cs
@@ -122,7 +122,9 @@ namespace PepperDash.Essentials.DM
 							return new DmTx4kz302CController(key, name, new DmTx4kz302C(chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx401"))
 							return new DmTx401CController(key, name, new DmTx401C(chassis.Inputs[num]));
-					}
+                        if (typeName.StartsWith("hdbasettx"))
+                            return new HDBaseTTxController(key, name, new HDTx3CB(chassis.Inputs[num]));
+                    }
 					else
 					{
 						if (typeName.StartsWith("dmtx200"))
@@ -145,7 +147,9 @@ namespace PepperDash.Essentials.DM
 							return new DmTx4kz302CController(key, name, new DmTx4kz302C(ipid, chassis.Inputs[num]));
 						if (typeName.StartsWith("dmtx401"))
 							return new DmTx401CController(key, name, new DmTx401C(ipid, chassis.Inputs[num]));
-					}
+                        if (typeName.StartsWith("hdbasettx"))
+                            return new HDBaseTTxController(key, name, new HDTx3CB(ipid, chassis.Inputs[num]));
+                    }
 				}
 				catch (Exception e)
 				{
@@ -355,7 +359,7 @@ namespace PepperDash.Essentials.DM
        public DmTxControllerFactory()
        {
            TypeNames = new List<string>() { "dmtx200c", "dmtx201c", "dmtx201s", "dmtx4k100c", "dmtx4k202c", "dmtx4kz202c", "dmtx4k302c", "dmtx4kz302c",
-                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g"  };
+                "dmtx401c", "dmtx401s", "dmtx4k100c1g", "dmtx4kz100c1g", "hdbasettx" };
        }

        public override EssentialsDevice BuildDevice(DeviceConfig dc)
--- a/DM/Essentials_DM/Endpoints/Transmitters/HDBaseTTxController.cs
+++ b/DM/Essentials_DM/Endpoints/Transmitters/HDBaseTTxController.cs
@@ -0,0 +1,113 @@
+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.DM.Endpoints.Transmitters;
+using Newtonsoft.Json;
+
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+using PepperDash.Essentials.Core.Bridges;
+
+namespace PepperDash.Essentials.DM
+{
+    /// <summary>
+    /// Controller class for suitable for HDBaseT transmitters
+    /// </summary>
+    [Description("Wrapper Class for HDBaseT devices based on HDTx3CB class")]
+    public class HDBaseTTxController: BasicDmTxControllerBase, IRoutingInputsOutputs, IComPorts
+    {
+        public RoutingInputPort HdmiIn { get; private set; }
+        public RoutingOutputPort DmOut { get; private set; }
+
+        public HDBaseTTxController(string key, string name, HDTx3CB tx)
+            : base(key, name, tx)
+        {
+            HdmiIn = new RoutingInputPort(DmPortName.HdmiIn1, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.Hdmi, null, this) { Port = tx };
+
+            DmOut = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video,
+                eRoutingPortConnectionType.DmCat, null, this);
+
+            InputPorts = new RoutingPortCollection<RoutingInputPort> { HdmiIn };
+            OutputPorts = new RoutingPortCollection<RoutingOutputPort> { DmOut };
+        }
+
+        #region IRoutingInputs Members
+
+        public RoutingPortCollection<RoutingInputPort> InputPorts { get; private set; }
+
+        #endregion
+
+        #region IRoutingOutputs Members
+
+        public RoutingPortCollection<RoutingOutputPort> OutputPorts { get; private set; }
+
+        #endregion
+        
+        #region IComPorts Members
+
+        public CrestronCollection<ComPort> ComPorts { get { return (Hardware as HDTx3CB).ComPorts; } }
+        public int NumberOfComPorts { get { return (Hardware as HDTx3CB).NumberOfComPorts; } }
+
+        #endregion
+
+        #region CrestronBridgeableBaseDevice abstract overrides
+
+        public override void LinkToApi(BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)
+        {
+            var joinMap = new HDBaseTTxControllerJoinMap(joinStart);
+
+            var joinMapSerialized = JoinMapHelper.GetSerializedJoinMapForDevice(joinMapKey);
+
+            if (!string.IsNullOrEmpty(joinMapSerialized))
+                joinMap = JsonConvert.DeserializeObject<HDBaseTTxControllerJoinMap>(joinMapSerialized);
+
+
+            if (bridge != null)
+            {
+                bridge.AddJoinMap(Key, joinMap);
+            }
+            else
+            {
+                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
+            }
+
+            Debug.Console(1, this, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
+
+            this.IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
+
+        }
+
+        #endregion
+    }
+
+    public class HDBaseTTxControllerJoinMap : JoinMapBaseAdvanced
+    {
+        [JoinName("IsOnline")]
+        public JoinDataComplete IsOnline = new JoinDataComplete(
+            new JoinData
+            {
+                JoinNumber = 1,
+                JoinSpan = 1
+            },
+            new JoinMetadata
+            {
+                Description = "HDBaseT device online feedback",
+                JoinCapabilities = eJoinCapabilities.ToSIMPL,
+                JoinType = eJoinType.Digital
+            });
+	
+        /// <summary>
+		/// Plugin device BridgeJoinMap constructor
+		/// </summary>
+		/// <param name="joinStart">This will be the join it starts on the EISC bridge</param>
+        public HDBaseTTxControllerJoinMap(uint joinStart)
+            : base(joinStart, typeof(HDBaseTTxControllerJoinMap))
+		{
+		}
+    }
+}
--- 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">
@@ -108,6 +108,7 @@
    <Compile Include="Endpoints\Transmitters\DmTx4kz202CController.cs" />
    <Compile Include="Endpoints\Transmitters\DmTx201SController.cs" />
    <Compile Include="Endpoints\Transmitters\DmTx4kz100Controller.cs" />
+    <Compile Include="Endpoints\Transmitters\HDBaseTTxController.cs" />
    <Compile Include="Endpoints\Transmitters\TxInterfaces.cs" />
    <Compile Include="IDmSwitch.cs" />
    <Compile Include="Config\DmpsRoutingConfig.cs" />
--- 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">
--- a/Common/VideoCodec/VideoCodecBase.cs
+++ b/Common/VideoCodec/VideoCodecBase.cs
@@ -74,10 +74,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 		{
 			get
 			{
-				return new List<Feedback>
-                {
-                    PrivacyModeIsOnFeedback,
-                    SharingSourceFeedback
+				return new List<Feedback>
+                {
+                    PrivacyModeIsOnFeedback,
+                    SharingSourceFeedback
                };
 			}
 		}
@@ -677,19 +677,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
 			var meetingIndex = 0;

 			var tokenArray = new XSigToken[maxMeetings * offset];
-			/* 
-			 * Digitals
-			 * IsJoinable - 1
-			 * IsDialable - 2
-			 * 
-			 * Serials
-			 * Organizer - 1
-			 * Title - 2
-			 * Start Date - 3
-			 * Start Time - 4
-			 * End Date - 5
-			 * End Time - 6
-			 * Id - 7
+			/* 
+			 * Digitals
+			 * IsJoinable - 1
+			 * IsDialable - 2
+			 * 
+			 * Serials
+			 * Organizer - 1
+			 * Title - 2
+			 * Start Date - 3
+			 * Start Time - 4
+			 * End Date - 5
+			 * End Time - 6
+			 * Id - 7
 			*/


@@ -848,7 +848,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec

 				Debug.Console(1, this, "Call Direction: {0}", args.CallItem.Direction);
 				Debug.Console(1, this, "Call is incoming: {0}", args.CallItem.Direction == eCodecCallDirection.Incoming);
-				trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming && args.CallItem.Status != eCodecCallStatus.Disconnected);
+				trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming && args.CallItem.Status == eCodecCallStatus.Ringing);				

 				if (args.CallItem.Direction == eCodecCallDirection.Incoming)
 				{
Author	SHA1	Message	Date
Andrew Welker	55cbd094be	Merge branch 'development' into feature/add-hdbasettx-support	2021-01-20 17:06:20 -07:00
Andrew Welker	da5fd7e743	Merge pull request #555 from PepperDash/hotfix/videocodecbase-incoming-call-popup Hotfix/videocodecbase incoming call popup	2021-01-20 14:52:05 -07:00
Neil Dorin	8545622c79	Merge branch 'development' into hotfix/videocodecbase-incoming-call-popup	2021-01-20 14:33:01 -07:00
Neil Dorin	2f172c998a	Merge pull request #552 from batourin/development Add hdbasettx device to Essentials DM	2021-01-18 15:28:09 -07:00
jkdevito	7945bce854	Upadted VideoCodecBase LinkVideoCodecCallControlsToApi IncomingCall bridge action to reference "args.CallItem.Status == eCodecCallStatus.Ringing" (previously referencing "args.CallItem.Status != eCodecCallStatus.Disconnected")	2021-01-18 15:37:39 -06:00
Maxim Batourine	6d66c5adee	add HDBaseTTxController to project file	2021-01-18 13:16:19 -05:00
Maxim Batourine	8ccbed6d81	Add hdbasettx device	2021-01-16 22:57:45 -05:00
Andrew Welker	c3c58e3201	Merge pull request #551 from PepperDash/hotfix/zoomroom-obtp-dialing Hotfix/zoomroom obtp dialing	2021-01-15 12:08:45 -07:00
Andrew Welker	f547eb3a09	Merge branch 'development' into hotfix/zoomroom-obtp-dialing	2021-01-15 11:50:35 -07:00
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