Merge pull request #1126 from PepperDash/hotfix/pd-core-ssh-fix

Hotfix/pd core ssh fix
Merge branch 'main' into hotfix/pd-core-ssh-fix
2026-01-27 03:14:57 +00:00 · 2023-08-25 09:01:17 -06:00 · 2023-08-25 08:40:07 -06:00 · 2023-08-24 08:15:31 -04:00 · 2023-08-21 16:00:03 -06:00 · 2023-08-21 15:27:25 -06:00
10 changed files with 88 additions and 14 deletions
--- a/PepperDashEssentials/PepperDashEssentials.csproj
+++ b/PepperDashEssentials/PepperDashEssentials.csproj
@@ -71,7 +71,7 @@
      <HintPath>..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
    </Reference>
    <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
    </Reference>
--- a/Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmRmcControllerJoinMap.cs
+++ b/Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmRmcControllerJoinMap.cs
@@ -8,6 +8,18 @@ namespace PepperDash.Essentials.Core.Bridges
        public JoinDataComplete IsOnline = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
            new JoinMetadata { Description = "DM RMC Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

+        [JoinName("VideoMuteOn")]
+        public JoinDataComplete VideoMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
+            new JoinMetadata { Description = "DM RMC Mute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("VideoMuteOff")]
+        public JoinDataComplete VideoMuteOff = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+            new JoinMetadata { Description = "DM RMC UnMute Video", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });
+
+        [JoinName("VideoMuteToggle")]
+        public JoinDataComplete VideoMuteToggle = new JoinDataComplete(new JoinData { JoinNumber = 5, JoinSpan = 1 },
+            new JoinMetadata { Description = "DM RMC Mute Video Toggle", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Digital });
+
        [JoinName("CurrentOutputResolution")]
        public JoinDataComplete CurrentOutputResolution = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
            new JoinMetadata { Description = "DM RMC Current Output Resolution", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Serial });
--- a/Core/PepperDashEssentialsBase/Bridges/JoinMaps/PduJoinMapBase.cs
+++ b/Core/PepperDashEssentialsBase/Bridges/JoinMaps/PduJoinMapBase.cs
@@ -10,7 +10,7 @@ namespace PepperDash.Essentials.Core.Bridges

        [JoinName("Online")]
        public JoinDataComplete Online = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
-            new JoinMetadata { Description = "PDU Name", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });
+            new JoinMetadata { Description = "Online", JoinCapabilities = eJoinCapabilities.ToSIMPL, JoinType = eJoinType.Digital });

        [JoinName("OutletCount")]
        public JoinDataComplete OutletCount = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
--- a/Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs
+++ b/Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs
@@ -356,16 +356,18 @@ namespace PepperDash.Essentials.Core
        {
            foreach (var customJoinData in joinData)
            {
-                var join = Joins[customJoinData.Key];
+                JoinDataComplete join;
+
+                if (!Joins.TryGetValue(customJoinData.Key, out join))
+                {
+                    Debug.Console(2, "No matching key found in join map for: '{0}'", customJoinData.Key);
+                    continue;
+                }

                if (join != null)
                {
                    join.SetCustomJoinData(customJoinData.Value);
                }
-                else
-                {
-                    Debug.Console(2, "No matching key found in join map for: '{0}'", customJoinData.Key);
-                }
            }

            PrintJoinMapInfo();
--- a/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
+++ b/Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
@@ -83,7 +83,7 @@
      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
    </Reference>
    <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
    </Reference>
--- a/DM/Essentials_DM/Endpoints/Receivers/DmRmc4KScalerCController.cs
+++ b/DM/Essentials_DM/Endpoints/Receivers/DmRmc4KScalerCController.cs
@@ -7,6 +7,7 @@ using PepperDash.Core;
 using PepperDash.Essentials.Core;
 using PepperDash.Essentials.Core.Bridges;
 using PepperDash_Essentials_DM;
+using System.Collections.Generic;

 namespace PepperDash.Essentials.DM
 {
@@ -16,7 +17,7 @@ namespace PepperDash.Essentials.DM
    /// </summary>
    [Description("Wrapper Class for DM-RMC-4K-SCALER-C")]
    public class DmRmc4kScalerCController : DmRmcControllerBase, IRoutingInputsOutputs, IBasicVolumeWithFeedback,
-        IIROutputPorts, IComPorts, ICec, IRelayPorts, IHasDmInHdcp
+        IIROutputPorts, IComPorts, ICec, IRelayPorts, IHasDmInHdcp, IBasicVideoMuteWithFeedback
    {
        private readonly DmRmc4kScalerC _rmc;

@@ -68,6 +69,7 @@ namespace PepperDash.Essentials.DM

            AddToFeedbackList(DmInHdcpStateFeedback);

+            VideoMuteIsOn = new BoolFeedback("HdmiOutputVideoMuteIsOn", () => _rmc.HdmiOutput.BlankEnabledFeedback.BoolValue);

            _rmc.HdmiOutput.OutputStreamChange += HdmiOutput_OutputStreamChange;
            _rmc.HdmiOutput.ConnectedDevice.DeviceInformationChange += ConnectedDevice_DeviceInformationChange;
@@ -83,6 +85,10 @@ namespace PepperDash.Essentials.DM
            {
                VideoOutputResolutionFeedback.FireUpdate();
            }
+            else if (args.EventId == EndpointOutputStreamEventIds.BlankEnabledFeedbackEventId)
+            {
+                VideoMuteIsOn.FireUpdate();
+            }
        }

        void ConnectedDevice_DeviceInformationChange(ConnectedDeviceInformation connectedDevice, ConnectedDeviceEventArgs args)
@@ -216,5 +222,40 @@ namespace PepperDash.Essentials.DM
            _rmc.DmInput.HdcpCapability = hdcpState;
        }

+
+        #region IBasicVideoMuteWithFeedback Members
+
+        public BoolFeedback VideoMuteIsOn
+        {
+            get;
+            private set;
+        }
+
+        public void VideoMuteOn()
+        {
+            Debug.Console(2, this, "Video Mute On");
+            _rmc.HdmiOutput.BlankEnabled();          
+        }
+
+        public void VideoMuteOff()
+        {
+            Debug.Console(2, this, "Video Mute Off");
+            _rmc.HdmiOutput.BlankDisabled();
+        }
+
+        #endregion
+
+        #region IBasicVideoMute Members
+
+        public void VideoMuteToggle()
+        {
+            Debug.Console(2, this, "Video Mute Toggle");
+            if (_rmc.HdmiOutput.BlankEnabledFeedback.BoolValue == true) 
+                VideoMuteOff();
+            else 
+                VideoMuteOn();
+        }
+
+        #endregion
    }
 }
--- a/DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs
+++ b/DM/Essentials_DM/Endpoints/Receivers/DmRmcHelper.cs
@@ -59,8 +59,13 @@ namespace PepperDash.Essentials.DM
            else
            {
                Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
-            }
+            }
+
+            LinkDmRmcToApi(rmc, trilist, joinMap);
+        }

+        protected void LinkDmRmcToApi(DmRmcControllerBase rmc, BasicTriList trilist, DmRmcControllerJoinMap joinMap)
+        {
            Debug.Console(1, rmc, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));

            IsOnline.LinkInputSig(trilist.BooleanInput[joinMap.IsOnline.JoinNumber]);
@@ -137,7 +142,19 @@ namespace PepperDash.Essentials.DM

            trilist.UShortInput[joinMap.HdcpSupportCapability.JoinNumber].UShortValue = (ushort)hdcpCapability;

-            trilist.UShortInput[joinMap.HdcpInputPortCount.JoinNumber].UShortValue = (ushort)routing.InputPorts.Count;
+            trilist.UShortInput[joinMap.HdcpInputPortCount.JoinNumber].UShortValue = (ushort)routing.InputPorts.Count;
+
+            var dmRmcScalerCBasicVideoMuteWithFeedback = rmc as IBasicVideoMuteWithFeedback;
+
+            if (dmRmcScalerCBasicVideoMuteWithFeedback != null)
+            {
+                Debug.Console(1, this, "Device is IBasicVideoMuteWithFeedback, linking video mute");
+                trilist.SetSigTrueAction(joinMap.VideoMuteToggle.JoinNumber, () => dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteToggle());
+                trilist.SetSigTrueAction(joinMap.VideoMuteOn.JoinNumber, () => dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteOn());
+                trilist.SetSigTrueAction(joinMap.VideoMuteOff.JoinNumber, () => dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteOff());
+                dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteIsOn.LinkInputSig(trilist.BooleanInput[joinMap.VideoMuteOn.JoinNumber]);
+                dmRmcScalerCBasicVideoMuteWithFeedback.VideoMuteIsOn.LinkComplementInputSig(trilist.BooleanInput[joinMap.VideoMuteOff.JoinNumber]);
+            }

            var routingWithFeedback = routing as IRmcRouting;
            if (routingWithFeedback == null) return;
@@ -149,6 +166,7 @@ namespace PepperDash.Essentials.DM

            trilist.SetUShortSigAction(joinMap.AudioVideoSource.JoinNumber,
                a => routingWithFeedback.ExecuteNumericSwitch(a, 1, eRoutingSignalType.AudioVideo));
+
        }

        #region Implementation of IDeviceInfoProvider
--- a/DM/Essentials_DM/PepperDash_Essentials_DM.csproj
+++ b/DM/Essentials_DM/PepperDash_Essentials_DM.csproj
@@ -59,7 +59,7 @@
      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
    </Reference>
    <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
    </Reference>
@@ -153,6 +153,7 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="VideoStatusHelpers.cs" />
    <None Include="app.config" />
+    <None Include="ClassDiagram1.cd" />
    <None Include="Properties\ControlSystem.cfg" />
  </ItemGroup>
  <ItemGroup>
--- a/essentials-framework/Essentials
+++ b/essentials-framework/Essentials
@@ -63,7 +63,7 @@
      <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.Lighting.dll</HintPath>
    </Reference>
    <Reference Include="mscorlib" />
-    <Reference Include="PepperDash_Core, Version=1.0.42.30563, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
    </Reference>
--- a/packages.config
+++ b/packages.config
@@ -1,3 +1,3 @@
 <packages>
-	<package id="PepperDashCore" version="1.2.1" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
+	<package id="PepperDashCore" version="1.3.1" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
 </packages>
Author	SHA1	Message	Date
Andrew Welker	555915b151	Merge pull request #1126 from PepperDash/hotfix/pd-core-ssh-fix Hotfix/pd core ssh fix	2023-08-25 09:01:17 -06:00
Andrew Welker	fa0f006b9b	Merge branch 'main' into hotfix/pd-core-ssh-fix	2023-08-25 08:40:07 -06:00
Nick Genovese	4c0fb6311b	fix: set core version to 1.3.1	2023-08-24 08:15:31 -04:00
Neil Dorin	0dcf45fc84	Merge pull request #1124 from PepperDash/hotfix/pdu-bridge-issues Custom Join Map Improvements	2023-08-21 16:00:03 -06:00
Andrew Welker	4d2ce83e75	fix: rework setting custom join data The previous method was causing an Exception to be thrown if a join didn't exist in the default join map for a device. This exception would prevent other devices from linking to a bridge correctly. This method now allows for join names to not be matched and the method will keep going.	2023-08-21 15:27:25 -06:00
Andrew Welker	da4070bad0	docs: correct PDU Online join name for printing	2023-08-21 15:23:33 -06:00
Nick Genovese	daf3f321bd	fix: bumped core version - bumped core to 1.3.1-hotfix-337 for ssh fixe	2023-08-16 10:25:26 -04:00
Andrew Welker	9c9b2952aa	Merge pull request #1122 from PepperDash/hotfix/crestron-db-updates Update Crestron DBS & PD Core	2023-08-15 12:25:37 -06:00
Andrew Welker	a7a4b75382	Merge branch 'main' into hotfix/crestron-db-updates	2023-08-15 11:00:27 -06:00
Andrew Welker	77f5dafdfe	Merge pull request #1110 from PepperDash/hotfix/DmRmcScalerCVideoMute Add support for VIdeo Mute to DM-RMC-4K-SCALER-C	2023-08-15 10:58:52 -06:00
Andrew Welker	b5bf87c634	build: update PD Core version	2023-08-15 10:02:42 -06:00
Andrew Welker	62f175c24a	chore: trigger build with new Crestron DBs	2023-08-15 09:38:34 -06:00
Andrew Welker	0cfcf61d6b	Merge branch 'main' into hotfix/DmRmcScalerCVideoMute	2023-07-27 12:05:32 -06:00
Andrew Welker	ef719b0a64	Merge pull request #1120 from PepperDash/hotfix/vtc-room-activation-deactivation-changes Hotfix/vtc room activation deactivation changes	2023-07-21 12:22:47 -06:00
Andrew Welker	2ffe24fd93	Merge branch 'main' into hotfix/DmRmcScalerCVideoMute	2023-06-07 12:12:26 -06:00
mhengeli	515ffd07f0	fix: added complimentary link for mute off. fix: Update references	2023-06-07 13:16:06 -04:00
mhengeli	16ea7a88be	fix: updated Core references	2023-06-07 12:22:03 -04:00
mhengeli	0f3b0580f0	feat: add videomute on/off for rmc scaler c	2023-06-07 09:45:25 -04:00