From 4f35a4285b4726c670232a96d966458db7e554d1 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 13 Feb 2020 16:17:23 -0700 Subject: [PATCH 1/2] Moves example configs inside PepperDashEssentials folder and makes them embedded resources --- .../configurationFile-HuddleSpace-2-Source.json | 0 ...igurationFile-mockVideoCodec_din-ap3_-_dm4x1.json | 0 .../SIMPLBridgeExample_configurationFile.json | 0 .../configurationFile-dmps3300c-avRouting.json | 0 PepperDashEssentials/PepperDashEssentials.csproj | 12 ++++++++++++ .../PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs | 4 +++- 6 files changed, 15 insertions(+), 1 deletion(-) rename {Example Configuration => PepperDashEssentials/Example Configuration}/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json (100%) rename {Example Configuration => PepperDashEssentials/Example Configuration}/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json (100%) rename {Example Configuration => PepperDashEssentials/Example Configuration}/SIMPLBridging/SIMPLBridgeExample_configurationFile.json (100%) rename {Example Configuration => PepperDashEssentials/Example Configuration}/SIMPLBridging/configurationFile-dmps3300c-avRouting.json (100%) diff --git a/Example Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json b/PepperDashEssentials/Example Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json similarity index 100% rename from Example Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json rename to PepperDashEssentials/Example Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json diff --git a/Example Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json b/PepperDashEssentials/Example Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json similarity index 100% rename from Example Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json rename to PepperDashEssentials/Example Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json diff --git a/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json b/PepperDashEssentials/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json similarity index 100% rename from Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json rename to PepperDashEssentials/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json diff --git a/Example Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json b/PepperDashEssentials/Example Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json similarity index 100% rename from Example Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json rename to PepperDashEssentials/Example Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj index f808a708..65a12025 100644 --- a/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials.csproj @@ -223,6 +223,18 @@ + + Always + + + Always + + + Always + + + Always + Always diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs index 23669066..2d7bfc51 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs @@ -31,7 +31,9 @@ namespace PepperDash.Essentials.Core } } - + /// + /// Base class for join maps + /// public abstract class JoinMapBase { /// From b5a7c76c3f7cfcbd764dc541358261cd73a61b96 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 13 Feb 2020 17:41:42 -0700 Subject: [PATCH 2/2] Minor formatting edits --- .../Config/Comm and IR/GenericHttpClient.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/GenericHttpClient.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/GenericHttpClient.cs index 830b10e1..87cde373 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/GenericHttpClient.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/GenericHttpClient.cs @@ -23,7 +23,6 @@ namespace PepperDash.Essentials.Core } - /// /// /// @@ -53,6 +52,7 @@ namespace PepperDash.Essentials.Core Client.Dispatch(request); Debug.Console(2, this, "GenericHttpClient SentRequest TX:'{0}'", url); } + private void Response(HttpClientResponse response, HTTP_CALLBACK_ERROR error, object request) { if (error == HTTP_CALLBACK_ERROR.COMPLETED)