pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-01-11 19:44:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22 from PepperDash/feature/add-example-configs

Browse Source 
Feature/add example configs
This commit is contained in:
Neil Dorin
2020-02-13 19:28:46 -07:00
committed by GitHub
parent 28d5daab5b b5a7c76c3f
commit f5586d2c9d
7 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Example Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json → PepperDashEssentials/Example Configuration/EssentialsHuddleSpaceRoom/configurationFile-HuddleSpace-2-Source.json
View File

0
Example Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json → PepperDashEssentials/Example Configuration/EssentialsHuddleVtc1Room/configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json
View File

0
Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json → PepperDashEssentials/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json
View File

0
Example Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json → PepperDashEssentials/Example Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json
View File

12
PepperDashEssentials/PepperDashEssentials.csproj
View File

@@ -223,6 +223,18 @@
<Compile Include="UI\EssentialsTouchpanelController.cs" />
<Compile Include="UI\SubpageReferenceListSourceItem.cs" />
<None Include="app.config" />
<EmbeddedResource Include="Example Configuration\EssentialsHuddleSpaceRoom\configurationFile-HuddleSpace-2-Source.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Example Configuration\EssentialsHuddleVtc1Room\configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Example Configuration\SIMPLBridging\configurationFile-dmps3300c-avRouting.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<EmbeddedResource Include="Example Configuration\SIMPLBridging\SIMPLBridgeExample_configurationFile.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
<None Include="Properties\ControlSystem.cfg" />
<EmbeddedResource Include="SGD\PepperDash Essentials iPad.sgd">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>

2
essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/GenericHttpClient.cs
View File

@@ -23,7 +23,6 @@ namespace PepperDash.Essentials.Core
}
/// <summary>
///
/// </summary>
@@ -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)

4
essentials-framework/Essentials Core/PepperDashEssentialsBase/JoinMaps/JoinMapBase.cs
View File

@@ -31,7 +31,9 @@ namespace PepperDash.Essentials.Core
}
}
/// <summary>
/// Base class for join maps
/// </summary>
public abstract class JoinMapBase
{
/// <summary>