From dbec871500344933ec61c66ffe75e249dac7e202 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 6 May 2020 11:13:43 -0600 Subject: [PATCH 1/4] fixes master.yml action...again --- .github/workflows/master.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index a362ea47..97f9d3e5 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -31,10 +31,7 @@ jobs: git config --global url."https://github.com/".insteadOf "git@github.com:" auth_header="$(git config --local --get http.https://github.com/.extraheader)" git submodule sync --recursive - git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1 - # Fetch all tags - - name: Fetch tags - run: git fetch --tags + git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth= # Generate the appropriate version number - name: Set Version Number shell: powershell From 2519fffb58bbf24bfafba91cc3c458385886ba84 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 6 May 2020 14:00:56 -0600 Subject: [PATCH 2/4] puts GetJoinMapForDevice method back into JoinMapHelper --- .../PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs index 8f792659..31616a6d 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs @@ -27,6 +27,16 @@ namespace PepperDash.Essentials.Core return joinMap; } + /// + /// Attempts to get the serialized join map from config + /// + /// + /// + public static string GetJoinMapForDevice(string joinMapKey) + { + return GetSerializedJoinMapForDevice(joinMapKey); + } + /// /// Attempts to find a custom join map by key and returns it deserialized if found /// From dc9d285de0c885e3c81c125d0873a7423f0cf4b7 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 6 May 2020 14:49:29 -0600 Subject: [PATCH 3/4] Adds condition to support dmc4kzhdo output card type --- .../Chassis/DmChassisController.cs | 7 + .../Essentials_DM/Essentials_DM.csproj | 159 ++++++++++++++++++ 2 files changed, 166 insertions(+) create mode 100644 essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs index 7313aece..789116e7 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs @@ -601,6 +601,13 @@ namespace PepperDash.Essentials.DM var cecPort2 = outputCard.Card2.HdmiOutput; AddDmcHdoPorts(number, cecPort1, cecPort2); } + else if (type == "dmc4kzhdo") + { + var outputCard = new Dmc4kzHdoSingle(number, Chassis); + var cecPort1 = outputCard.Card1.HdmiOutput; + var cecPort2 = outputCard.Card2.HdmiOutput; + AddDmcHdoPorts(number, cecPort1, cecPort2); + } else if (type == "dmchdo") { var outputCard = new DmcHdoSingle(number, Chassis); diff --git a/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj b/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj new file mode 100644 index 00000000..cc9d85c6 --- /dev/null +++ b/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj @@ -0,0 +1,159 @@ + + + Release + AnyCPU + 9.0.30729 + 2.0 + {9199CE8A-0C9F-4952-8672-3EED798B284F} + Library + Properties + PepperDash.Essentials.DM + PepperDash_Essentials_DM + {0B4745B0-194B-4BB6-8E21-E9057CA92300};{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + WindowsCE + E2BECB1F-8C8C-41ba-B736-9BE7D946A398 + 5.0 + SmartDeviceProject1 + v3.5 + Windows CE + + + + + .allowedReferenceRelatedFileExtensions + true + full + false + bin\ + DEBUG;TRACE; + prompt + 4 + 512 + true + true + off + + + .allowedReferenceRelatedFileExtensions + none + true + bin\ + prompt + 4 + 512 + true + true + off + + + + False + ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll + + + False + ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DM.dll + + + False + ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll + + + + False + ..\..\pepperdashcore-builds\PepperDash_Core.dll + + + False + ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpCustomAttributesInterface.dll + False + + + False + ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpHelperInterface.dll + False + + + False + ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpNewtonsoft.dll + + + False + ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe + False + + + False + ..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {A49AD6C8-FC0A-4CC0-9089-DFB4CF92D2B5} + PepperDash_Essentials_Core + + + + + + + + + rem S# Pro preparation will execute after these operations + + \ No newline at end of file From f7a41f08c4f48e72eda4b642f8c00c2cce814856 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 6 May 2020 15:35:54 -0600 Subject: [PATCH 4/4] fixes audio source feedback and setting audio source 4kz302C does not support audio breakway routing. --- .../Endpoints/Transmitters/DmTx4kz302CController.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs index 27340407..c4c1ec6b 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs @@ -109,7 +109,8 @@ namespace PepperDash.Essentials.DM }); AudioSourceNumericFeedback = new IntFeedback(() => { - return (int)Tx.AudioSourceFeedback; + //Doing this because 4kz302 does not allow for breakaway audio source selection + return (int)Tx.VideoSourceFeedback; }); HdmiIn1HdcpCapabilityFeedback = new IntFeedback("HdmiIn1HdcpCapability", () => @@ -250,7 +251,11 @@ namespace PepperDash.Essentials.DM // NOTE: It's possible that this particular TX model may not like the AudioSource property being set. // The SIMPL definition only shows a single analog for AudioVideo Source if ((signalType | eRoutingSignalType.Audio) == eRoutingSignalType.Audio) - Tx.AudioSource = (eAst)inputSelector; + { + //it doesn't... + Debug.Console(2, this, "Unable to execute audio-only switch for tx {0}", Key); + //Tx.AudioSource = (eAst) inputSelector; + } } void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args)