From 3648bdcae455e2e7ef7db54450308b288c3a4b58 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Mon, 3 Feb 2020 14:27:28 -0700 Subject: [PATCH 01/23] fixed ECS-1255 by checking for inputSlotSupportsHdcp2 config value on each input card and defaulting to false if not defined in config. --- .../Bridges/DmChassisControllerBridge.cs | 10 +- .../Chassis/DmChassisController.cs | 98 +++++++++++++++---- 2 files changed, 83 insertions(+), 25 deletions(-) diff --git a/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs b/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs index c85854b6..f87f2109 100644 --- a/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs +++ b/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs @@ -81,14 +81,14 @@ namespace PepperDash.Essentials.Bridges } } - if (basicTxDevice != null && advancedTxDevice == null) - trilist.BooleanInput[joinMap.TxAdvancedIsPresent + ioSlot].BoolValue = true; - - if (advancedTxDevice != null) + if (advancedTxDevice != null) // Advanced TX device { advancedTxDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]); + + // Flag if the TX is an advanced endpoint type + trilist.BooleanInput[joinMap.TxAdvancedIsPresent + ioSlot].BoolValue = true; } - else if(advancedTxDevice == null || basicTxDevice != null) + else if(advancedTxDevice == null || basicTxDevice != null) // Basic TX device { Debug.Console(1, "Setting up actions and feedbacks on input card {0}", ioSlot); dmChassis.VideoInputSyncFeedbacks[ioSlot].LinkInputSig(trilist.BooleanInput[joinMap.VideoSyncStatus + ioSlot]); diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs index 094b8022..d0a6ba63 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs @@ -104,9 +104,12 @@ namespace PepperDash.Essentials.DM } var controller = new DmChassisController(key, name, chassis); + // add the cards and port names - foreach (var kvp in properties.InputSlots) - controller.AddInputCard(kvp.Value, kvp.Key); + foreach (var kvp in properties.InputSlots) + { + controller.AddInputCard(kvp.Value, kvp.Key); + } foreach (var kvp in properties.OutputSlots) { controller.AddOutputCard(kvp.Value, kvp.Key); @@ -188,11 +191,18 @@ namespace PepperDash.Essentials.DM SystemIdBusyFeedback = new BoolFeedback(() => { return (Chassis as DmMDMnxn).SystemIdBusy.BoolValue; }); InputCardHdcpCapabilityFeedbacks = new Dictionary(); InputCardHdcpCapabilityTypes = new Dictionary(); + } + public override bool CustomActivate() + { + Debug.Console(2, this, "Setting up feedbacks."); - for (uint x = 1; x <= Chassis.NumberOfOutputs; x++) + // Setup Output Card Feedbacks + for (uint x = 1; x <= Chassis.NumberOfOutputs; x++) { - var tempX = x; + var tempX = x; + + Debug.Console(2, this, "Setting up feedbacks for output slot: {0}", tempX); if (Chassis.Outputs[tempX] != null) { @@ -235,26 +245,41 @@ namespace PepperDash.Essentials.DM } }); OutputAudioRouteNameFeedbacks[tempX] = new StringFeedback(() => + { + if (Chassis.Outputs[tempX].AudioOutFeedback != null) { - if (Chassis.Outputs[tempX].AudioOutFeedback != null) - { - return Chassis.Outputs[tempX].AudioOutFeedback.NameFeedback.StringValue; - } - else - { - return NoRouteText; + return Chassis.Outputs[tempX].AudioOutFeedback.NameFeedback.StringValue; + } + else + { + return NoRouteText; - } - }); + } + }); - OutputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => + OutputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => { return Chassis.Outputs[tempX].EndpointOnlineFeedback; }); } + else + { + Debug.Console(2, this, "No Output Card defined in slot: {0}", tempX); + } + }; + + // Setup Input Card Feedbacks + for (uint x = 1; x <= Chassis.NumberOfInputs; x++) + { + var tempX = x; + + Debug.Console(2, this, "Setting up feedbacks for input slot: {0}", tempX); + + CheckForHdcp2Property(tempX); if (Chassis.Inputs[tempX] != null) { + UsbInputRoutedToFeebacks[tempX] = new IntFeedback(() => { if (Chassis.Inputs[tempX].USBRoutedToFeedback != null) { return (ushort)Chassis.Inputs[tempX].USBRoutedToFeedback.Number; } @@ -279,7 +304,7 @@ namespace PepperDash.Essentials.DM } }); - InputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => + InputEndpointOnlineFeedbacks[tempX] = new BoolFeedback(() => { return Chassis.Inputs[tempX].EndpointOnlineFeedback; }); @@ -288,6 +313,8 @@ namespace PepperDash.Essentials.DM { var inputCard = Chassis.Inputs[tempX]; + Debug.Console(2, this, "Adding InputCardHdcpCapabilityFeedback for slot: {0}", inputCard); + if (inputCard.Card is DmcHd) { InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport; @@ -342,8 +369,32 @@ namespace PepperDash.Essentials.DM return 0; }); } - } - } + else + { + Debug.Console(2, this, "No Input Card defined in slot: {0}", tempX); + } + } + + return base.CustomActivate(); + } + + /// + /// Checks for presence of config property defining if the input card supports HDCP2. + /// If not found, assumes false. + /// + /// Input Slot + void CheckForHdcp2Property(uint inputSlot) + { + if (!PropertiesConfig.InputSlotSupportsHdcp2.ContainsKey(inputSlot)) + { + Debug.Console(0, this, Debug.ErrorLogLevel.Warning, +@"Properties Config does not define inputSlotSupportsHdcp2 entry for input card: {0}. Assuming false. +If HDCP2 is required, HDCP control/feedback will not fucntion correctly!", inputSlot); + PropertiesConfig.InputSlotSupportsHdcp2.Add(inputSlot, false); + } + else + Debug.Console(2, this, "inputSlotSupportsHdcp2 for input card: {0} = {1}", inputSlot, PropertiesConfig.InputSlotSupportsHdcp2[inputSlot]); + } /// /// @@ -566,6 +617,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); @@ -579,13 +637,13 @@ namespace PepperDash.Essentials.DM var cecPort1 = outputCard.Card1.HdmiOutput; AddDmcCoPorts(number, cecPort1); } - else if (type == "dmc4kzcohd") - { + else if (type == "dmc4kzcohd") + { var outputCard = new Dmc4kzCoHdSingle(number, Chassis); var cecPort1 = outputCard.Card1.HdmiOutput; AddDmcCoPorts(number, cecPort1); } - else if (type == "dmccohd") + else if (type == "dmccohd") { var outputCard = new DmcCoHdSingle(number, Chassis); var cecPort1 = outputCard.Card1.HdmiOutput; From 73ab16ce55c49bd2895fb5f9f0964f9d11a49878 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Tue, 18 Feb 2020 20:09:51 -0700 Subject: [PATCH 02/23] Adds FreeRun support for DM-TX-201-C. Need to test on NYC hardware and then apply to other TX classes. --- .../Transmitters/DmTx201CController.cs | 34 +++++++++++++++++-- .../Endpoints/Transmitters/IFreeRunEnabled.cs | 20 +++++++++++ .../Essentials_DM/Essentials_DM.csproj | 1 + 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/IFreeRunEnabled.cs diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs index ba7a005d..28c5611b 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs @@ -19,7 +19,7 @@ namespace PepperDash.Essentials.DM /// /// Controller class for all DM-TX-201C/S/F transmitters /// - public class DmTx201XController : DmTxControllerBase, ITxRouting, IHasFeedback + public class DmTx201XController : DmTxControllerBase, ITxRouting, IHasFeedback, IHasFreeRun { public DmTx201S Tx { get; private set; } // uses the 201S class as it is the base class for the 201C @@ -33,8 +33,7 @@ namespace PepperDash.Essentials.DM public IntFeedback AudioSourceNumericFeedback { get; protected set; } public IntFeedback HdmiInHdcpCapabilityFeedback { get; protected set; } - //public override IntFeedback HdcpSupportAllFeedback { get; protected set; } - //public override ushort HdcpSupportCapability { get; protected set; } + public BoolFeedback FreeRunEnabledFeedback { get; protected set; } /// /// Helps get the "real" inputs, including when in Auto @@ -122,6 +121,8 @@ namespace PepperDash.Essentials.DM return 0; }); + FreeRunEnabledFeedback = new BoolFeedback(() => tx.VgaInput.FreeRunFeedback == eDmFreeRunSetting.Enabled); + HdcpSupportCapability = eHdcpCapabilityType.HdcpAutoSupport; var combinedFuncs = new VideoStatusFuncsWrapper @@ -195,6 +196,28 @@ namespace PepperDash.Essentials.DM return base.CustomActivate(); } + /// + /// Enables or disables free run + /// + /// + public void SetFreeRunEnabled(bool enable) + { + if (enable) + { + Tx.VgaInput.FreeRun = eDmFreeRunSetting.Enabled; + } + else + { + Tx.VgaInput.FreeRun = eDmFreeRunSetting.Disabled; + } + } + + /// + /// Switches the audio/video source based on the integer value (0-Auto, 1-HDMI, 2-VGA, 3-Disable) + /// + /// + /// + /// public void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type) { Debug.Console(2, this, "Executing Numeric Switch to input {0}.", input); @@ -250,6 +273,7 @@ namespace PepperDash.Essentials.DM Debug.Console(2, this, " Audio Source: {0}", Tx.AudioSourceFeedback); AudioSourceNumericFeedback.FireUpdate(); } + } void InputStreamChangeEvent(EndpointInputStream inputStream, EndpointInputStreamEventArgs args) @@ -264,6 +288,10 @@ namespace PepperDash.Essentials.DM { HdmiInHdcpCapabilityFeedback.FireUpdate(); } + else if (args.EventId == EndpointInputStreamEventIds.FreeRunFeedbackEventId) + { + FreeRunEnabledFeedback.FireUpdate(); + } } /// diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/IFreeRunEnabled.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/IFreeRunEnabled.cs new file mode 100644 index 00000000..7410af9c --- /dev/null +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/IFreeRunEnabled.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using Crestron.SimplSharp; + +using PepperDash.Essentials.Core; + +namespace PepperDash.Essentials.DM +{ + /// + /// Defines a device capable of setting the Free Run state of a VGA input and reporting feedback + /// + public interface IHasFreeRun + { + BoolFeedback FreeRunEnabledFeedback { get; } + + void SetFreeRunEnabled(bool enable); + } +} \ No newline at end of file diff --git a/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj b/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj index 6f31634d..127a9e42 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj +++ b/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj @@ -96,6 +96,7 @@ + From 3e16cbb092421df55a2f2992e009b40b82e5d7f7 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Tue, 18 Feb 2020 20:45:01 -0700 Subject: [PATCH 03/23] Adds VGA brightness and contrast feedback/control to DM-TX-201-C --- .../Transmitters/DmTx201CController.cs | 38 +++++++++++++++++-- .../{IFreeRunEnabled.cs => TxInterfaces.cs} | 12 ++++++ .../Essentials_DM/Essentials_DM.csproj | 2 +- 3 files changed, 48 insertions(+), 4 deletions(-) rename essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/{IFreeRunEnabled.cs => TxInterfaces.cs} (57%) diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs index 28c5611b..9195851e 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs @@ -35,6 +35,9 @@ namespace PepperDash.Essentials.DM public BoolFeedback FreeRunEnabledFeedback { get; protected set; } + public IntFeedback VgaBrightnessFeedback { get; protected set; } + public IntFeedback VgaContrastFeedback { get; protected set; } + /// /// Helps get the "real" inputs, including when in Auto /// @@ -123,6 +126,11 @@ namespace PepperDash.Essentials.DM FreeRunEnabledFeedback = new BoolFeedback(() => tx.VgaInput.FreeRunFeedback == eDmFreeRunSetting.Enabled); + VgaBrightnessFeedback = new IntFeedback(() => tx.VgaInput.VideoControls.BrightnessFeedback.UShortValue); + VgaContrastFeedback = new IntFeedback(() => tx.VgaInput.VideoControls.ContrastFeedback.UShortValue); + + tx.VgaInput.VideoControls.ControlChange += new Crestron.SimplSharpPro.DeviceSupport.GenericEventHandler(VideoControls_ControlChange); + HdcpSupportCapability = eHdcpCapabilityType.HdcpAutoSupport; var combinedFuncs = new VideoStatusFuncsWrapper @@ -157,7 +165,7 @@ namespace PepperDash.Essentials.DM }; AnyVideoInput = new RoutingInputPortWithVideoStatuses(DmPortName.AnyVideoIn, - eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, 0, this, combinedFuncs); + eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.None, 0, this, combinedFuncs); DmOutput = new RoutingOutputPort(DmPortName.DmOut, eRoutingSignalType.Audio | eRoutingSignalType.Video, eRoutingPortConnectionType.DmCat, null, this); HdmiLoopOut = new RoutingOutputPort(DmPortName.HdmiLoopOut, eRoutingSignalType.Audio | eRoutingSignalType.Video, @@ -175,6 +183,21 @@ namespace PepperDash.Essentials.DM DmOutput.Port = Tx.DmOutput; } + void VideoControls_ControlChange(object sender, Crestron.SimplSharpPro.DeviceSupport.GenericEventArgs args) + { + var id = args.EventId; + Debug.Console(2, this, "EventId {0}", args.EventId); + + if (id == VideoControlsEventIds.BrightnessFeedbackEventId) + { + VgaBrightnessFeedback.FireUpdate(); + } + else if (id == VideoControlsEventIds.ContrastFeedbackEventId) + { + VgaContrastFeedback.FireUpdate(); + } + } + void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args) { ActiveVideoInputFeedback.FireUpdate(); @@ -184,8 +207,7 @@ namespace PepperDash.Essentials.DM } public override bool CustomActivate() - { - + { Tx.HdmiInput.InputStreamChange += (o, a) => FowardInputStreamChange(HdmiInput, a.EventId); Tx.HdmiInput.VideoAttributes.AttributeChange += (o, a) => FireVideoAttributeChange(HdmiInput, a.EventId); @@ -212,6 +234,16 @@ namespace PepperDash.Essentials.DM } } + public void SetVgaBrightness(ushort level) + { + Tx.VgaInput.VideoControls.Brightness.UShortValue = level; + } + + public void SetVgaContrast(ushort level) + { + Tx.VgaInput.VideoControls.Contrast.UShortValue = level; + } + /// /// Switches the audio/video source based on the integer value (0-Auto, 1-HDMI, 2-VGA, 3-Disable) /// diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/IFreeRunEnabled.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/TxInterfaces.cs similarity index 57% rename from essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/IFreeRunEnabled.cs rename to essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/TxInterfaces.cs index 7410af9c..50955dda 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/IFreeRunEnabled.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/TxInterfaces.cs @@ -17,4 +17,16 @@ namespace PepperDash.Essentials.DM void SetFreeRunEnabled(bool enable); } + + /// + /// Defines a device capable of adjusting VGA settings + /// + public interface IVgaBrightnessContrastControls + { + IntFeedback VgaBrightnessFeedback { get; } + IntFeedback VgaContrastFeedback { get; } + + void SetVgaBrightness(ushort level); + void SetVgaContrast(ushort level); + } } \ No newline at end of file diff --git a/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj b/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj index 127a9e42..322cbdab 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj +++ b/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj @@ -96,7 +96,7 @@ - + From e894e2d1b4feaffe3a638d0bc479b28eec91370c Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Tue, 18 Feb 2020 20:46:42 -0700 Subject: [PATCH 04/23] Adds IVgaBrightnessContrastControls to DmTx201XController --- .../Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs index 9195851e..c5811263 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs @@ -19,7 +19,7 @@ namespace PepperDash.Essentials.DM /// /// Controller class for all DM-TX-201C/S/F transmitters /// - public class DmTx201XController : DmTxControllerBase, ITxRouting, IHasFeedback, IHasFreeRun + public class DmTx201XController : DmTxControllerBase, ITxRouting, IHasFeedback, IHasFreeRun, IVgaBrightnessContrastControls { public DmTx201S Tx { get; private set; } // uses the 201S class as it is the base class for the 201C From c62508b8ae9e3fb5ef12e0c51eb9f558fbfe4526 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 19 Feb 2020 10:41:42 -0700 Subject: [PATCH 05/23] Create CONTRIBUTING.md --- CONTRIBUTING.md | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..47fb6951 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,110 @@ +# Contributors Guide + +Essentials is an open source project. If you are interested in making it better, +there are many ways you can contribute. For example, you can: + +- Submit a bug report +- Suggest a new feature +- Provide feedback by commenting on feature requests/proposals +- Propose a patch by submitting a pull request +- Suggest or submit documentation improvements +- Review outstanding pull requests +- Answer questions from other users +- Share the software with other users who are interested +- Teach others to use the software + +## Bugs and Feature Requests + +If you believe that you have found a bug or wish to propose a new feature, +please first search the existing [issues] to see if it has already been +reported. If you are unable to find an existing issue, consider using one of +the provided templates to create a new issue and provide as many details as you +can to assist in reproducing the bug or explaining your proposed feature. + +## Patch Submission tips + +Patches should be submitted in the form of Pull Requests to the Essentials +[repository] on GitHub. But first, consider the following tips to ensure a +smooth process when submitting a patch: + +- Ensure that the patch compiles and does not break any build-time tests. +- Be understanding, patient, and friendly; developers may need time to review + your submissions before they can take action or respond. This does not mean + your contribution is not valued. If your contribution has not received a + response in a reasonable time, consider commenting with a polite inquiry for + an update. +- Limit your patches to the smallest reasonable change to achieve your intended + goal. For example, do not make unnecessary indentation changes; but don't go + out of your way to make the patch so minimal that it isn't easy to read, + either. Consider the reviewer's perspective. +- Before submission, please squash your commits to using a message that starts + with the issue number and a description of the changes. +- Isolate multiple patches from each other. If you wish to make several + independent patches, do so in separate, smaller pull requests that can be + reviewed more easily. +- Be prepared to answer questions from reviewers. They may have further + questions before accepting your patch, and may even propose changes. Please + accept this feedback constructively, and not as a rejection of your proposed + change. + +## GitFlow Branch Model +This repository adheres to the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branch model and is intitialized for GitFlow to make for consistend branch name prefixes. Please take time to familiarize yourself with this model. + +- `master` will contain the latest stable version of the framework and release builds will be created from tagged commits on `master`. +- HotFix/Patch Pull Requests should target the `master` as the base branch. +- All other Pull Requests (bug fixes, enhancements, etc.) should target the `development` as the base branch. +- `release/vX.Y.X` branches will be used for release candidates when moving new features from `development` to `master`. + Beta builds will be created from tagged commits on release candidate branches. + +## Review + +- We welcome code reviews from anyone. A committer is required to formally + accept and merge the changes. +- Reviewers will be looking for things like threading issues, performance + implications, API design, duplication of existing functionality, readability + and code style, avoidance of bloat (scope-creep), etc. +- Reviewers will likely ask questions to better understand your change. +- Reviewers will make comments about changes to your patch: + - MUST means that the change is required + - SHOULD means that the change is suggested, further discussion on the + subject may be required + - COULD means that the change is optional + +## Timeline and Managing Expectations + +As we continue to engage contributors and learn best practices for running a successful open source project, our processes +and guidance will likely evolve. We will try to communicate expectations as we are able and to always be responsive. We +hope that the community will share their suggestions for improving this engagement. Based on the level of initial interest +we receive and the availability of resources to evaluate contributions, we anticipate the following: + +- We will initially prioritize pull requests that include small bug fixes and code that addresses potential vulnerabilities + as well as pull requests that include improvements for processor language specifications because these require a + reasonable amount of effort to evaluate and will help us exercise and revise our process for accepting contributions. In + other words, we are going to start small in order to work out the kinks first. +- We are committed to maintaining the integrity and security of our code base. In addition to the careful review the + maintainers will give to code contributions to make sure they do not introduce new bugs or vulnerabilities, we will be + trying to identify best practices to incorporate with our open source project so that contributors can have more control + over whether their contributions are accepted. These might include things like style guides and requirements for tests and + documentation to accompany some code contributions. As a result, it may take a long time for some contributions to be + accepted. This does not mean we are ignoring them. +- We are committed to integrating this GitHub project with our team's regular development work flow so that the open source + project remains dynamic and relevant. This may affect our responsiveness and ability to accept pull requests + quickly. This does not mean we are ignoring them. +- Not all innovative ideas need to be accepted as pull requests into this GitHub project to be valuable to the community. + There may be times when we recommend that you just share your code for some enhancement to Ghidra from your own + repository. As we identify and recognize extensions that are of general interest to the reverse engineering community, we + may seek to incorporate them with our baseline. + +## Legal + +Consistent with Section D.6. of the GitHub Terms of Service as of 2019, and the MIT license, the project maintainer for this project accepts contributions using the inbound=outbound model. +When you submit a pull request to this repository (inbound), you are agreeing to license your contribution under the same terms as specified in [LICENSE] (outbound). + +This is an open source project. +Contributions you make to this repository are completely voluntary. +When you submit an issue, bug report, question, enhancement, pull request, etc., you are offering your contribution without expectation of payment, you expressly waive any future pay claims against PepperDash related to your contribution, and you acknowledge that this does not create an obligation on the part of PepperDash of any kind. +Furthermore, your contributing to this project does not create an employer-employee relationship between the PepperDash and the contributor. + +[issues]: https://github.com/PepperDash/Essentials/issues +[repository]: https://github.com/PepperDash/Essentials +[LICENSE]: https://github.com/PepperDash/Essentials/blob/master/LICENSE.md From ddeb41832ff2871d00e60379d0df8bea80cea146 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 19 Feb 2020 12:41:48 -0700 Subject: [PATCH 06/23] Update CONTRIBUTING.md Fixes spelling and grammar errors pointed out by @minesguy82 --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 47fb6951..890b7769 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,11 +48,11 @@ smooth process when submitting a patch: change. ## GitFlow Branch Model -This repository adheres to the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branch model and is intitialized for GitFlow to make for consistend branch name prefixes. Please take time to familiarize yourself with this model. +This repository adheres to the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branch model and is intitialized for GitFlow to make for consistent branch name prefixes. Please take time to familiarize yourself with this model. - `master` will contain the latest stable version of the framework and release builds will be created from tagged commits on `master`. -- HotFix/Patch Pull Requests should target the `master` as the base branch. -- All other Pull Requests (bug fixes, enhancements, etc.) should target the `development` as the base branch. +- HotFix/Patch Pull Requests should target `master` as the base branch. +- All other Pull Requests (bug fixes, enhancements, etc.) should target `development` as the base branch. - `release/vX.Y.X` branches will be used for release candidates when moving new features from `development` to `master`. Beta builds will be created from tagged commits on release candidate branches. From b7f97dc146cf1069e16b7fb6b0705743eda63b24 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 20 Feb 2020 15:32:49 -0700 Subject: [PATCH 07/23] Adds new joins to DmTxControllerJoinMap and associated bridge --- .../Bridges/DmTxControllerBridge.cs | 20 +++++++++++++++++-- .../Bridges/JoinMaps/DmTxControllerJoinMap.cs | 20 +++++++++++++++++++ .../Timers/CountdownTimer.cs | 12 +++++++---- .../Transmitters/DmTx201CController.cs | 8 ++++++++ 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/PepperDashEssentials/Bridges/DmTxControllerBridge.cs b/PepperDashEssentials/Bridges/DmTxControllerBridge.cs index 2017acb4..91f8c6d7 100644 --- a/PepperDashEssentials/Bridges/DmTxControllerBridge.cs +++ b/PepperDashEssentials/Bridges/DmTxControllerBridge.cs @@ -57,7 +57,7 @@ namespace PepperDash.Essentials.Bridges trilist.UShortInput[joinMap.HdcpSupportCapability].UShortValue = (ushort)tx.HdcpSupportCapability; - if(txR.InputPorts[DmPortName.HdmiIn] != null) + if (txR.InputPorts[DmPortName.HdmiIn] != null) { var inputPort = txR.InputPorts[DmPortName.HdmiIn]; @@ -71,7 +71,7 @@ namespace PepperDash.Essentials.Bridges SetHdcpCapabilityAction(hdcpTypeSimple, port, joinMap.Port1HdcpState, trilist); } } - + if (txR.InputPorts[DmPortName.HdmiIn1] != null) { var inputPort = txR.InputPorts[DmPortName.HdmiIn1]; @@ -103,6 +103,22 @@ namespace PepperDash.Essentials.Bridges } } + + var txFreeRun = tx as IHasFreeRun; + if (txFreeRun != null) + { + txFreeRun.FreeRunEnabledFeedback.LinkInputSig(trilist.BooleanInput[joinMap.FreeRunEnabled]); + trilist.SetBoolSigAction(joinMap.FreeRunEnabled, new Action(b => txFreeRun.SetFreeRunEnabled(b))); + } + + var txVga = tx as IVgaBrightnessContrastControls; + { + txVga.VgaBrightnessFeedback.LinkInputSig(trilist.UShortInput[joinMap.VgaBrightness]); + txVga.VgaContrastFeedback.LinkInputSig(trilist.UShortInput[joinMap.VgaContrast]); + + trilist.SetUShortSigAction(joinMap.VgaBrightness, new Action(u => txVga.SetVgaBrightness(u))); + trilist.SetUShortSigAction(joinMap.VgaContrast, new Action(u => txVga.SetVgaContrast(u))); + } } static void SetHdcpCapabilityAction(bool hdcpTypeSimple, EndpointHdmiInput port, uint join, BasicTriList trilist) diff --git a/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs index e68e5ad2..ff673cab 100644 --- a/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs +++ b/PepperDashEssentials/Bridges/JoinMaps/DmTxControllerJoinMap.cs @@ -18,6 +18,10 @@ namespace PepperDash.Essentials.Bridges /// High when video sync is detected /// public uint VideoSyncStatus { get; set; } + /// + /// + /// + public uint FreeRunEnabled { get; set; } #endregion #region Analogs @@ -41,6 +45,16 @@ namespace PepperDash.Essentials.Bridges /// Sets and reports the current HDCP state for the corresponding input port /// public uint Port2HdcpState { get; set; } + + /// + /// Sets and reports the current VGA Brightness level + /// + public uint VgaBrightness { get; set; } + + /// + /// Sets and reports the current VGA Contrast level + /// + public uint VgaContrast { get; set; } #endregion #region Serials @@ -56,6 +70,7 @@ namespace PepperDash.Essentials.Bridges // Digital IsOnline = 1; VideoSyncStatus = 2; + FreeRunEnabled = 3; // Serial CurrentInputResolution = 1; // Analog @@ -64,6 +79,8 @@ namespace PepperDash.Essentials.Bridges HdcpSupportCapability = 3; Port1HdcpState = 4; Port2HdcpState = 5; + VgaBrightness = 6; + VgaContrast = 7; } public override void OffsetJoinNumbers(uint joinStart) @@ -72,12 +89,15 @@ namespace PepperDash.Essentials.Bridges IsOnline = IsOnline + joinOffset; VideoSyncStatus = VideoSyncStatus + joinOffset; + FreeRunEnabled = FreeRunEnabled + joinOffset; CurrentInputResolution = CurrentInputResolution + joinOffset; VideoInput = VideoInput + joinOffset; AudioInput = AudioInput + joinOffset; HdcpSupportCapability = HdcpSupportCapability + joinOffset; Port1HdcpState = Port1HdcpState + joinOffset; Port2HdcpState = Port2HdcpState + joinOffset; + VgaBrightness = VgaBrightness + joinOffset; + VgaContrast = VgaContrast + joinOffset; } } } \ No newline at end of file diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Timers/CountdownTimer.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Timers/CountdownTimer.cs index a8da97e4..4878a206 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Timers/CountdownTimer.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Timers/CountdownTimer.cs @@ -23,6 +23,10 @@ namespace PepperDash.Essentials.Core public StringFeedback TimeRemainingFeedback { get; private set; } public bool CountsDown { get; set; } + + /// + /// The number of seconds to countdown + /// public int SecondsToCount { get; set; } public DateTime StartTime { get; private set; } @@ -31,7 +35,7 @@ namespace PepperDash.Essentials.Core CTimer SecondTimer; /// - /// + /// Constructor /// /// public SecondsCountdownTimer(string key) @@ -61,7 +65,7 @@ namespace PepperDash.Essentials.Core } /// - /// + /// Starts the Timer /// public void Start() { @@ -82,7 +86,7 @@ namespace PepperDash.Essentials.Core } /// - /// + /// Restarts the timer /// public void Reset() { @@ -91,7 +95,7 @@ namespace PepperDash.Essentials.Core } /// - /// + /// Cancels the timer (without triggering it to finish) /// public void Cancel() { diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs index c5811263..37ee38b3 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx201CController.cs @@ -234,11 +234,19 @@ namespace PepperDash.Essentials.DM } } + /// + /// Sets the VGA brightness level + /// + /// public void SetVgaBrightness(ushort level) { Tx.VgaInput.VideoControls.Brightness.UShortValue = level; } + /// + /// Sets the VGA contrast level + /// + /// public void SetVgaContrast(ushort level) { Tx.VgaInput.VideoControls.Contrast.UShortValue = level; From 4be32cb909767cdb1b6951f5a5c4b74235dc1e17 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Fri, 21 Feb 2020 16:31:52 -0700 Subject: [PATCH 08/23] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 34 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 21 ++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..c969d2a1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,34 @@ +--- +name: Bug report +about: Create a report to help us improve +title: "[BUG]-" +labels: bug +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**Stacktrace** + +Include a stack trace of the exception if possible. +``` +Paste stack trace here +``` + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..0a854e75 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,21 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: "[FEATURE]-" +labels: enhancement +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] +If this is a request for support for a new device or type, be as specific as possible and include any pertinent manufacturer and model information. + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From a1e9d35a69e1a6ddefe65365e5c080fd4c9a96f2 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Mon, 24 Feb 2020 12:21:52 -0700 Subject: [PATCH 09/23] Implements IHasFreeRun and IHasVgaBrightnessContrastControls on DMTx200Controller --- .../Transmitters/DmTx200Controller.cs | 65 ++++++++++++++++++- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx200Controller.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx200Controller.cs index 3b48a0f5..42ecf5c6 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx200Controller.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx200Controller.cs @@ -19,7 +19,7 @@ namespace PepperDash.Essentials.DM /// /// Controller class for all DM-TX-201C/S/F transmitters /// - public class DmTx200Controller : DmTxControllerBase, ITxRouting, IHasFeedback + public class DmTx200Controller : DmTxControllerBase, ITxRouting, IHasFeedback, IHasFreeRun, IVgaBrightnessContrastControls { public DmTx200C2G Tx { get; private set; } @@ -32,8 +32,10 @@ namespace PepperDash.Essentials.DM public IntFeedback AudioSourceNumericFeedback { get; protected set; } public IntFeedback HdmiInHdcpCapabilityFeedback { get; protected set; } - //public override IntFeedback HdcpSupportAllFeedback { get; protected set; } - //public override ushort HdcpSupportCapability { get; protected set; } + public BoolFeedback FreeRunEnabledFeedback { get; protected set; } + + public IntFeedback VgaBrightnessFeedback { get; protected set; } + public IntFeedback VgaContrastFeedback { get; protected set; } /// /// Helps get the "real" inputs, including when in Auto @@ -123,6 +125,14 @@ namespace PepperDash.Essentials.DM HdcpSupportCapability = eHdcpCapabilityType.HdcpAutoSupport; + FreeRunEnabledFeedback = new BoolFeedback(() => tx.VgaInput.FreeRunFeedback == eDmFreeRunSetting.Enabled); + + VgaBrightnessFeedback = new IntFeedback(() => tx.VgaInput.VideoControls.BrightnessFeedback.UShortValue); + VgaContrastFeedback = new IntFeedback(() => tx.VgaInput.VideoControls.ContrastFeedback.UShortValue); + + tx.VgaInput.VideoControls.ControlChange += new Crestron.SimplSharpPro.DeviceSupport.GenericEventHandler(VideoControls_ControlChange); + + var combinedFuncs = new VideoStatusFuncsWrapper { HdcpActiveFeedbackFunc = () => @@ -170,6 +180,21 @@ namespace PepperDash.Essentials.DM DmOutput.Port = Tx.DmOutput; } + void VideoControls_ControlChange(object sender, Crestron.SimplSharpPro.DeviceSupport.GenericEventArgs args) + { + var id = args.EventId; + Debug.Console(2, this, "EventId {0}", args.EventId); + + if (id == VideoControlsEventIds.BrightnessFeedbackEventId) + { + VgaBrightnessFeedback.FireUpdate(); + } + else if (id == VideoControlsEventIds.ContrastFeedbackEventId) + { + VgaContrastFeedback.FireUpdate(); + } + } + void Tx_OnlineStatusChange(GenericBase currentDevice, OnlineOfflineEventArgs args) { ActiveVideoInputFeedback.FireUpdate(); @@ -191,6 +216,40 @@ namespace PepperDash.Essentials.DM return base.CustomActivate(); } + /// + /// Enables or disables free run + /// + /// + public void SetFreeRunEnabled(bool enable) + { + if (enable) + { + Tx.VgaInput.FreeRun = eDmFreeRunSetting.Enabled; + } + else + { + Tx.VgaInput.FreeRun = eDmFreeRunSetting.Disabled; + } + } + + /// + /// Sets the VGA brightness level + /// + /// + public void SetVgaBrightness(ushort level) + { + Tx.VgaInput.VideoControls.Brightness.UShortValue = level; + } + + /// + /// Sets the VGA contrast level + /// + /// + public void SetVgaContrast(ushort level) + { + Tx.VgaInput.VideoControls.Contrast.UShortValue = level; + } + public void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type) { Debug.Console(2, this, "Executing Numeric Switch to input {0}.", input); From d80602d3c6e1c22abcad9b57c3c221e1c3eb5666 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Mon, 24 Feb 2020 14:11:18 -0700 Subject: [PATCH 10/23] Adds IHasFreeRun and IVgaBrightnessContrastControls to 401 and 302 Tx controller classes --- .../Transmitters/DmTx401CController.cs | 63 +++++++++++++++++- .../Transmitters/DmTx4k302CController.cs | 66 ++++++++++++++++++- 2 files changed, 125 insertions(+), 4 deletions(-) diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx401CController.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx401CController.cs index 86003aae..18e91fbe 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx401CController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx401CController.cs @@ -17,7 +17,7 @@ namespace PepperDash.Essentials.DM { using eVst = DmTx401C.eSourceSelection; - public class DmTx401CController : DmTxControllerBase, ITxRouting, IHasFeedback, IIROutputPorts, IComPorts + public class DmTx401CController : DmTxControllerBase, ITxRouting, IHasFeedback, IIROutputPorts, IComPorts, IHasFreeRun, IVgaBrightnessContrastControls { public DmTx401C Tx { get; private set; } @@ -34,6 +34,11 @@ namespace PepperDash.Essentials.DM public IntFeedback AudioSourceNumericFeedback { get; protected set; } public IntFeedback HdmiInHdcpCapabilityFeedback { get; protected set; } + public BoolFeedback FreeRunEnabledFeedback { get; protected set; } + + public IntFeedback VgaBrightnessFeedback { get; protected set; } + public IntFeedback VgaContrastFeedback { get; protected set; } + /// /// Helps get the "real" inputs, including when in Auto /// @@ -130,6 +135,13 @@ namespace PepperDash.Essentials.DM HdcpSupportCapability = eHdcpCapabilityType.HdcpAutoSupport; + FreeRunEnabledFeedback = new BoolFeedback(() => tx.VgaInput.FreeRunFeedback == eDmFreeRunSetting.Enabled); + + VgaBrightnessFeedback = new IntFeedback(() => tx.VgaInput.VideoControls.BrightnessFeedback.UShortValue); + VgaContrastFeedback = new IntFeedback(() => tx.VgaInput.VideoControls.ContrastFeedback.UShortValue); + + tx.VgaInput.VideoControls.ControlChange += new Crestron.SimplSharpPro.DeviceSupport.GenericEventHandler(VideoControls_ControlChange); + var combinedFuncs = new VideoStatusFuncsWrapper { HdcpActiveFeedbackFunc = () => @@ -269,6 +281,55 @@ namespace PepperDash.Essentials.DM } } + void VideoControls_ControlChange(object sender, Crestron.SimplSharpPro.DeviceSupport.GenericEventArgs args) + { + var id = args.EventId; + Debug.Console(2, this, "EventId {0}", args.EventId); + + if (id == VideoControlsEventIds.BrightnessFeedbackEventId) + { + VgaBrightnessFeedback.FireUpdate(); + } + else if (id == VideoControlsEventIds.ContrastFeedbackEventId) + { + VgaContrastFeedback.FireUpdate(); + } + } + + /// + /// Enables or disables free run + /// + /// + public void SetFreeRunEnabled(bool enable) + { + if (enable) + { + Tx.VgaInput.FreeRun = eDmFreeRunSetting.Enabled; + } + else + { + Tx.VgaInput.FreeRun = eDmFreeRunSetting.Disabled; + } + } + + /// + /// Sets the VGA brightness level + /// + /// + public void SetVgaBrightness(ushort level) + { + Tx.VgaInput.VideoControls.Brightness.UShortValue = level; + } + + /// + /// Sets the VGA contrast level + /// + /// + public void SetVgaContrast(ushort level) + { + Tx.VgaInput.VideoControls.Contrast.UShortValue = level; + } + /// /// Relays the input stream change to the appropriate RoutingInputPort. /// diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4k302CController.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4k302CController.cs index cb91f857..baaac013 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4k302CController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4k302CController.cs @@ -19,7 +19,7 @@ namespace PepperDash.Essentials.DM using eAst = Crestron.SimplSharpPro.DeviceSupport.eX02AudioSourceType; public class DmTx4k302CController : DmTxControllerBase, ITxRouting, IHasFeedback, - IIROutputPorts, IComPorts + IIROutputPorts, IComPorts, IHasFreeRun, IVgaBrightnessContrastControls { public DmTx4k302C Tx { get; private set; } @@ -35,8 +35,10 @@ namespace PepperDash.Essentials.DM public IntFeedback HdmiIn1HdcpCapabilityFeedback { get; protected set; } public IntFeedback HdmiIn2HdcpCapabilityFeedback { get; protected set; } - //public override IntFeedback HdcpSupportAllFeedback { get; protected set; } - //public override ushort HdcpSupportCapability { get; protected set; } + public BoolFeedback FreeRunEnabledFeedback { get; protected set; } + + public IntFeedback VgaBrightnessFeedback { get; protected set; } + public IntFeedback VgaContrastFeedback { get; protected set; } /// /// Helps get the "real" inputs, including when in Auto @@ -122,6 +124,13 @@ namespace PepperDash.Essentials.DM HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support; + FreeRunEnabledFeedback = new BoolFeedback(() => tx.VgaInput.FreeRunFeedback == eDmFreeRunSetting.Enabled); + + VgaBrightnessFeedback = new IntFeedback(() => tx.VgaInput.VideoControls.BrightnessFeedback.UShortValue); + VgaContrastFeedback = new IntFeedback(() => tx.VgaInput.VideoControls.ContrastFeedback.UShortValue); + + tx.VgaInput.VideoControls.ControlChange += new Crestron.SimplSharpPro.DeviceSupport.GenericEventHandler(VideoControls_ControlChange); + var combinedFuncs = new VideoStatusFuncsWrapper { @@ -181,6 +190,21 @@ namespace PepperDash.Essentials.DM DmOut.Port = Tx.DmOutput; } + void VideoControls_ControlChange(object sender, Crestron.SimplSharpPro.DeviceSupport.GenericEventArgs args) + { + var id = args.EventId; + Debug.Console(2, this, "EventId {0}", args.EventId); + + if (id == VideoControlsEventIds.BrightnessFeedbackEventId) + { + VgaBrightnessFeedback.FireUpdate(); + } + else if (id == VideoControlsEventIds.ContrastFeedbackEventId) + { + VgaContrastFeedback.FireUpdate(); + } + } + public override bool CustomActivate() @@ -199,6 +223,42 @@ namespace PepperDash.Essentials.DM return base.CustomActivate(); } + /// + /// Enables or disables free run + /// + /// + public void SetFreeRunEnabled(bool enable) + { + if (enable) + { + Tx.VgaInput.FreeRun = eDmFreeRunSetting.Enabled; + } + else + { + Tx.VgaInput.FreeRun = eDmFreeRunSetting.Disabled; + } + } + + /// + /// Sets the VGA brightness level + /// + /// + public void SetVgaBrightness(ushort level) + { + Tx.VgaInput.VideoControls.Brightness.UShortValue = level; + } + + /// + /// Sets the VGA contrast level + /// + /// + public void SetVgaContrast(ushort level) + { + Tx.VgaInput.VideoControls.Contrast.UShortValue = level; + } + + + public void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType type) { Debug.Console(2, this, "Executing Numeric Switch to input {0}.", input); From bea94ceaf089e0192cbf3911ebd5129dbc0ff450 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Mon, 24 Feb 2020 16:07:38 -0700 Subject: [PATCH 11/23] Fixes incorrect spelling of Extensions --- PepperDashEssentials/Bridges/DmChassisControllerBridge.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs b/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs index f87f2109..23294997 100644 --- a/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs +++ b/PepperDashEssentials/Bridges/DmChassisControllerBridge.cs @@ -16,7 +16,7 @@ using Newtonsoft.Json; namespace PepperDash.Essentials.Bridges { - public static class DmChassisControllerApiExtentions + public static class DmChassisControllerApiExtensions { public static void LinkToApi(this DmChassisController dmChassis, BasicTriList trilist, uint joinStart, string joinMapKey) { From 7be1c6df449af031633c698d6ad0414e34936970 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Mon, 24 Feb 2020 16:09:58 -0700 Subject: [PATCH 12/23] Updates to PD.Core v1.0.34 --- essentials-framework/pepperdashcore-builds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/essentials-framework/pepperdashcore-builds b/essentials-framework/pepperdashcore-builds index 27a665b6..7db7cb27 160000 --- a/essentials-framework/pepperdashcore-builds +++ b/essentials-framework/pepperdashcore-builds @@ -1 +1 @@ -Subproject commit 27a665b68a0725729bb09138bb85f575833df4b2 +Subproject commit 7db7cb27f613b52dd0b056f6973ead05ffe1c14a From 943ae2115bdb308339ca767785ed3a254ed1b651 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Mon, 24 Feb 2020 16:12:58 -0700 Subject: [PATCH 13/23] Closes #33 --- .../Bridges/JoinMaps/DmChassisControllerJoinMap.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs b/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs index d04004b9..7c920cc4 100644 --- a/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs +++ b/PepperDashEssentials/Bridges/JoinMaps/DmChassisControllerJoinMap.cs @@ -139,6 +139,7 @@ namespace PepperDash.Essentials.Bridges OutputEndpointOnline = OutputEndpointOnline + joinOffset; HdcpSupportState = HdcpSupportState + joinOffset; HdcpSupportCapability = HdcpSupportCapability + joinOffset; + TxAdvancedIsPresent = TxAdvancedIsPresent + joinOffset; } } } From 263e792768423343a83520c64d450c17191090ec Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 4 Mar 2020 08:36:35 -0700 Subject: [PATCH 14/23] added input sig links for the program information fixes issue #52 --- PepperDashEssentials/Bridges/SystemMonitorBridge.cs | 10 ++++++++++ essentials-framework/pepperdashcore-builds | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/PepperDashEssentials/Bridges/SystemMonitorBridge.cs b/PepperDashEssentials/Bridges/SystemMonitorBridge.cs index d374b9df..4e66ea08 100644 --- a/PepperDashEssentials/Bridges/SystemMonitorBridge.cs +++ b/PepperDashEssentials/Bridges/SystemMonitorBridge.cs @@ -61,6 +61,16 @@ namespace PepperDash.Essentials.Bridges (b => SystemMonitor.ProgramCollection[programNumber].RegistrationState = eProgramRegistrationState.Unregister)); p.Value.ProgramUnregisteredFeedback.LinkInputSig(trilist.BooleanInput[programSlotJoinStart + joinMap.ProgramUnregister]); + p.Value.ProgramNameFeedback.LinkInputSig(trilist.StringInput[programSlotJoinStart + joinMap.ProgramName]); + p.Value.ProgramCompileTimeFeedback.LinkInputSig( + trilist.StringInput[programSlotJoinStart + joinMap.ProgramCompiledTime]); + p.Value.CrestronDataBaseVersionFeedback.LinkInputSig( + trilist.StringInput[programSlotJoinStart + joinMap.ProgramCrestronDatabaseVersion]); + p.Value.EnvironmentVersionFeedback.LinkInputSig( + trilist.StringInput[programSlotJoinStart + joinMap.ProgramEnvironmentVersion]); + p.Value.AggregatedProgramInfoFeedback.LinkInputSig( + trilist.StringInput[programSlotJoinStart + joinMap.AggregatedProgramInfo]); + programSlotJoinStart = programSlotJoinStart + joinMap.ProgramOffsetJoin; } } diff --git a/essentials-framework/pepperdashcore-builds b/essentials-framework/pepperdashcore-builds index 27a665b6..acebe6b4 160000 --- a/essentials-framework/pepperdashcore-builds +++ b/essentials-framework/pepperdashcore-builds @@ -1 +1 @@ -Subproject commit 27a665b68a0725729bb09138bb85f575833df4b2 +Subproject commit acebe6b43b28cc3a93f899e9714292a0cc1ab2cc From 687300811e1cf295f79bfafc54c7de7130089bb0 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 4 Mar 2020 11:11:11 -0700 Subject: [PATCH 15/23] Updates to PD.Core v1.0.35 --- essentials-framework/pepperdashcore-builds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/essentials-framework/pepperdashcore-builds b/essentials-framework/pepperdashcore-builds index acebe6b4..7db7cb27 160000 --- a/essentials-framework/pepperdashcore-builds +++ b/essentials-framework/pepperdashcore-builds @@ -1 +1 @@ -Subproject commit acebe6b43b28cc3a93f899e9714292a0cc1ab2cc +Subproject commit 7db7cb27f613b52dd0b056f6973ead05ffe1c14a From 003a2aa76d36984c2395e5b8ff9e835137f8fe56 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 4 Mar 2020 11:11:36 -0700 Subject: [PATCH 16/23] Updates to PD.Core v1.0.35 --- essentials-framework/pepperdashcore-builds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/essentials-framework/pepperdashcore-builds b/essentials-framework/pepperdashcore-builds index 7db7cb27..15206840 160000 --- a/essentials-framework/pepperdashcore-builds +++ b/essentials-framework/pepperdashcore-builds @@ -1 +1 @@ -Subproject commit 7db7cb27f613b52dd0b056f6973ead05ffe1c14a +Subproject commit 15206840b3e6338f695e4ffba634a72e51ea1be5 From 4126df47202fe94f10394eb9fc74d6752f4d32af Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Wed, 4 Mar 2020 11:22:02 -0700 Subject: [PATCH 17/23] Updates PD.Core to v1.0.35 --- essentials-framework/pepperdashcore-builds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/essentials-framework/pepperdashcore-builds b/essentials-framework/pepperdashcore-builds index 7db7cb27..15206840 160000 --- a/essentials-framework/pepperdashcore-builds +++ b/essentials-framework/pepperdashcore-builds @@ -1 +1 @@ -Subproject commit 7db7cb27f613b52dd0b056f6973ead05ffe1c14a +Subproject commit 15206840b3e6338f695e4ffba634a72e51ea1be5 From 05377b06fb4eaff518b82ae9ebfbe1b7db3a7d91 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 5 Mar 2020 16:07:21 -0700 Subject: [PATCH 18/23] Create main.yml Adds script for CI triggers --- .github/workflows/main.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..5fb11cc8 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,18 @@ +name: Build Non-Release Branch + +on: + push: + branches: + - feature/* + - bugfix/* + - hotfix/* + +jobs: + build: + name: Build + runs-on: self-hosted + steps: + - run: Invoke-WebRequest -URI "http://localhost:8080/job/Essentials%20Builds/build?token=$($Env:projectToken)" -Headers @{Authorization = "Basic $([System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes("ndorin:$($Env:token)")))"} -Method POST -UseBasicParsing + env: + token: ${{ secrets.TOKEN }} + projectToken: ${{ secrets.PROJECTTOKEN}} From 27bae27771177f8c8045b5121fe67ac7ea77482d Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 5 Mar 2020 16:26:43 -0700 Subject: [PATCH 19/23] Adds Test.txt to trigger builds --- Test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Test.txt diff --git a/Test.txt b/Test.txt new file mode 100644 index 00000000..503d93a1 --- /dev/null +++ b/Test.txt @@ -0,0 +1 @@ +jaldfja \ No newline at end of file From bc004a8764b2426af2b85223370c3f18af90c3f4 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 5 Mar 2020 16:49:03 -0700 Subject: [PATCH 20/23] Updates AssemblyInfo.cs files to include AssemblyInformationalVersion and resets default versions to 0.0.0.*. Updates assembly version script to accomodate changes --- PepperDashEssentials/ControlSystem.cs | 8 +++++--- .../Properties/AssemblyInfo.cs | 14 ++++++++------ .../Properties/UpdateAssemblyVersion.ps1 | 19 +++++++++++++++---- .../Properties/AssemblyInfo.cs | 13 ++++++++----- .../Essentials_DM/Essentials_DM.csproj | 4 ++++ .../Essentials_DM/Properties/AssemblyInfo.cs | 13 ++++++++----- .../Properties/AssemblyInfo.cs | 13 ++++++++----- 7 files changed, 56 insertions(+), 28 deletions(-) diff --git a/PepperDashEssentials/ControlSystem.cs b/PepperDashEssentials/ControlSystem.cs index 62aee267..a88d932b 100644 --- a/PepperDashEssentials/ControlSystem.cs +++ b/PepperDashEssentials/ControlSystem.cs @@ -96,10 +96,12 @@ namespace PepperDash.Essentials string directoryPrefix; directoryPrefix = Crestron.SimplSharp.CrestronIO.Directory.GetApplicationRootDirectory(); - - var version = Crestron.SimplSharp.Reflection.Assembly.GetExecutingAssembly().GetName().Version; - Global.SetAssemblyVersion(string.Format("{0}.{1}.{2}", version.Major, version.Minor, version.Build)); + var fullVersion = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false); + + AssemblyInformationalVersionAttribute fullVersionAtt = fullVersion[0] as AssemblyInformationalVersionAttribute; + + Global.SetAssemblyVersion(fullVersionAtt.InformationalVersion); if (CrestronEnvironment.DevicePlatform != eDevicePlatform.Server) // Handles 3-series running Windows CE OS { diff --git a/PepperDashEssentials/Properties/AssemblyInfo.cs b/PepperDashEssentials/Properties/AssemblyInfo.cs index 83beada4..36e6828b 100644 --- a/PepperDashEssentials/Properties/AssemblyInfo.cs +++ b/PepperDashEssentials/Properties/AssemblyInfo.cs @@ -1,8 +1,10 @@ using System.Reflection; +using Crestron.SimplSharp.Reflection; -[assembly: AssemblyTitle("PepperDashEssentials")] -[assembly: AssemblyCompany("PepperDash Technology Corp")] -[assembly: AssemblyProduct("PepperDashEssentials")] -[assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2018")] -[assembly: AssemblyVersion("1.4.0.*")] - +[assembly: System.Reflection.AssemblyTitle("PepperDashEssentials")] +[assembly: System.Reflection.AssemblyCompany("PepperDash Technology Corp")] +[assembly: System.Reflection.AssemblyProduct("PepperDashEssentials")] +[assembly: System.Reflection.AssemblyCopyright("Copyright © PepperDash Technology Corp 2020")] +[assembly: System.Reflection.AssemblyVersion("0.0.0.*")] +[assembly: System.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")] +[assembly: Crestron.SimplSharp.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")] diff --git a/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 b/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 index 46392b31..396b5cf0 100644 --- a/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 +++ b/PepperDashEssentials/Properties/UpdateAssemblyVersion.ps1 @@ -1,13 +1,23 @@ function Update-SourceVersion { Param ([string]$Version) - $NewVersion = ‘AssemblyVersion("‘ + $Version + ‘.*")’; + $fullVersion = $Version + $baseVersion = [regex]::Match($Version, "(\d+.\d+.\d+).*").captures.groups[1].value + $NewAssemblyVersion = ‘AssemblyVersion("‘ + $baseVersion + ‘.*")’ + echo "AssemblyVersion = $NewAssemblyVersion" + $NewAssemblyInformationalVersion = ‘AssemblyInformationalVersion("‘ + $Version + ‘")’ + echo "AssemblyInformationalVersion = $NewAssemblyInformationalVersion" + foreach ($o in $input) - { + { Write-output $o.FullName $TmpFile = $o.FullName + “.tmp” get-content $o.FullName | - %{$_ -replace ‘AssemblyVersion\("(\d+\.\d+\.\d+)\.\*"\)’, $NewVersion } > $TmpFile + %{ + $_ -replace ‘AssemblyVersion\(".*"\)’, $NewAssemblyVersion} | + %{ + $_ -replace ‘AssemblyInformationalVersion\(".*"\)’, $NewAssemblyInformationalVersion + } > $TmpFile move-item $TmpFile $o.FullName -force } } @@ -21,9 +31,10 @@ function Update-AllAssemblyInfoFiles ( $version ) } # validate arguments -$r= [System.Text.RegularExpressions.Regex]::Match($args[0], "^\d+\.\d+\.\d+$"); +$r= [System.Text.RegularExpressions.Regex]::Match($args[0], "\d+\.\d+\.\d+.*"); if ($r.Success) { + echo "Updating Assembly Version to $args ..."; Update-AllAssemblyInfoFiles $args[0]; } else diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Properties/AssemblyInfo.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Properties/AssemblyInfo.cs index f9464b7d..fc3f61d8 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Properties/AssemblyInfo.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Properties/AssemblyInfo.cs @@ -1,7 +1,10 @@ using System.Reflection; +using Crestron.SimplSharp.Reflection; -[assembly: AssemblyTitle("PepperDashEssentialsBase")] -[assembly: AssemblyCompany("PepperDash Technology Corp")] -[assembly: AssemblyProduct("PepperDashEssentialsBase")] -[assembly: AssemblyCopyright("Copyright © Ppperdash 2019")] -[assembly: AssemblyVersion("1.4.0.*")] \ No newline at end of file +[assembly: System.Reflection.AssemblyTitle("PepperDashEssentialsBase")] +[assembly: System.Reflection.AssemblyCompany("PepperDash Technology Corp")] +[assembly: System.Reflection.AssemblyProduct("PepperDashEssentials")] +[assembly: System.Reflection.AssemblyCopyright("Copyright © PepperDash Technology Corp 2020")] +[assembly: System.Reflection.AssemblyVersion("0.0.0.*")] +[assembly: System.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")] +[assembly: Crestron.SimplSharp.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")] \ No newline at end of file diff --git a/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj b/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj index 6f31634d..f40cb869 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj +++ b/essentials-framework/Essentials DM/Essentials_DM/Essentials_DM.csproj @@ -82,6 +82,10 @@ ..\..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpPro.exe False + + False + ..\..\..\..\..\..\ProgramData\Crestron\SDK\SimplSharpReflectionInterface.dll + diff --git a/essentials-framework/Essentials DM/Essentials_DM/Properties/AssemblyInfo.cs b/essentials-framework/Essentials DM/Essentials_DM/Properties/AssemblyInfo.cs index d11fa984..1f506f3a 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Properties/AssemblyInfo.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Properties/AssemblyInfo.cs @@ -1,7 +1,10 @@ using System.Reflection; +using Crestron.SimplSharp.Reflection; -[assembly: AssemblyTitle("Essentials_DM")] -[assembly: AssemblyCompany("PepperDash Technology Corp")] -[assembly: AssemblyProduct("Essentials_DM")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyVersion("1.3.*")] \ No newline at end of file +[assembly: System.Reflection.AssemblyTitle("Essentials_DM")] +[assembly: System.Reflection.AssemblyCompany("PepperDash Technology Corp")] +[assembly: System.Reflection.AssemblyProduct("PepperDashEssentials")] +[assembly: System.Reflection.AssemblyCopyright("Copyright © PepperDash Technology Corp 2020")] +[assembly: System.Reflection.AssemblyVersion("0.0.0.*")] +[assembly: System.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")] +[assembly: Crestron.SimplSharp.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")] \ No newline at end of file diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Properties/AssemblyInfo.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Properties/AssemblyInfo.cs index 95a08a40..ccea4891 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Properties/AssemblyInfo.cs +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Properties/AssemblyInfo.cs @@ -1,7 +1,10 @@ using System.Reflection; +using Crestron.SimplSharp.Reflection; -[assembly: AssemblyTitle("Essentials_Devices_Common")] -[assembly: AssemblyCompany("PepperDash Technology Corp")] -[assembly: AssemblyProduct("Essentials_Devices_Common")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyVersion("1.4.*")] \ No newline at end of file +[assembly: System.Reflection.AssemblyTitle("Essentials_Devices_Common")] +[assembly: System.Reflection.AssemblyCompany("PepperDash Technology Corp")] +[assembly: System.Reflection.AssemblyProduct("PepperDashEssentials")] +[assembly: System.Reflection.AssemblyCopyright("Copyright © PepperDash Technology Corp 2020")] +[assembly: System.Reflection.AssemblyVersion("0.0.0.*")] +[assembly: System.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")] +[assembly: Crestron.SimplSharp.Reflection.AssemblyInformationalVersion("0.0.0-buildType-buildNumber")] \ No newline at end of file From c9ce835786a60a318ad65ab10bb0445890ba44ba Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Fri, 6 Mar 2020 10:42:18 -0700 Subject: [PATCH 21/23] Removes unnecessary Test.txt --- Test.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Test.txt diff --git a/Test.txt b/Test.txt deleted file mode 100644 index 503d93a1..00000000 --- a/Test.txt +++ /dev/null @@ -1 +0,0 @@ -jaldfja \ No newline at end of file From b5e5eebac60ef91d3e3c933b9c4c3f0b994ebc42 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Fri, 6 Mar 2020 12:04:51 -0700 Subject: [PATCH 22/23] updates to PD.Core v1.0.35 adds test text file to trigger CI builds --- CITest.txt | 1 + essentials-framework/pepperdashcore-builds | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 CITest.txt diff --git a/CITest.txt b/CITest.txt new file mode 100644 index 00000000..74547b16 --- /dev/null +++ b/CITest.txt @@ -0,0 +1 @@ +asdfa;sldkaf diff --git a/essentials-framework/pepperdashcore-builds b/essentials-framework/pepperdashcore-builds index acebe6b4..15206840 160000 --- a/essentials-framework/pepperdashcore-builds +++ b/essentials-framework/pepperdashcore-builds @@ -1 +1 @@ -Subproject commit acebe6b43b28cc3a93f899e9714292a0cc1ab2cc +Subproject commit 15206840b3e6338f695e4ffba634a72e51ea1be5 From 1632f5888c12747bc50172086461fa7d66627f5d Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Fri, 6 Mar 2020 12:43:26 -0700 Subject: [PATCH 23/23] removes test file --- CITest.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CITest.txt diff --git a/CITest.txt b/CITest.txt deleted file mode 100644 index 74547b16..00000000 --- a/CITest.txt +++ /dev/null @@ -1 +0,0 @@ -asdfa;sldkaf