diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
index b26471dd..9e982700 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/VideoCodecControllerJoinMap.cs
@@ -1576,6 +1576,36 @@ namespace PepperDash.Essentials.Core.Bridges.JoinMaps
JoinType = eJoinType.Serial
});
+ [JoinName("AvailableLayoutsFb")]
+ public JoinDataComplete AvailableLayoutsFb = new JoinDataComplete(
+ new JoinData
+ {
+ JoinNumber = 142,
+ JoinSpan = 1
+ },
+ new JoinMetadata
+ {
+ Description = "xSig of all available layouts",
+ JoinCapabilities = eJoinCapabilities.ToSIMPL,
+ JoinType = eJoinType.Serial
+ });
+
+ [JoinName("SelectLayout")]
+ public JoinDataComplete SelectLayout = new JoinDataComplete(
+ new JoinData
+ {
+ JoinNumber = 142,
+ JoinSpan = 1
+ },
+ new JoinMetadata
+ {
+ Description = "Select Layout by string",
+ JoinCapabilities = eJoinCapabilities.FromSIMPL,
+ JoinType = eJoinType.Serial
+ });
+
+
+
[JoinName("CurrentParticipants")]
public JoinDataComplete CurrentParticipants = new JoinDataComplete(
new JoinData
@@ -3014,6 +3044,35 @@ namespace PepperDash_Essentials_Core.Bridges.JoinMaps
JoinType = eJoinType.Serial
});
+ [JoinName("AvailableLayoutsFb")]
+ public JoinDataComplete AvailableLayoutsFb = new JoinDataComplete(
+ new JoinData
+ {
+ JoinNumber = 142,
+ JoinSpan = 1
+ },
+ new JoinMetadata
+ {
+ Description = "xSig of all available layouts",
+ JoinCapabilities = eJoinCapabilities.ToSIMPL,
+ JoinType = eJoinType.Serial
+ });
+
+ [JoinName("SelectLayout")]
+ public JoinDataComplete SelectLayout = new JoinDataComplete(
+ new JoinData
+ {
+ JoinNumber = 142,
+ JoinSpan = 1
+ },
+ new JoinMetadata
+ {
+ Description = "Select Layout by string",
+ JoinCapabilities = eJoinCapabilities.FromSIMPL,
+ JoinType = eJoinType.Serial
+ });
+
+
[JoinName("CurrentParticipants")]
public JoinDataComplete CurrentParticipants = new JoinDataComplete(
new JoinData
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/DeviceConfig.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/DeviceConfig.cs
index 1d9ed1c2..5c1ee54c 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/DeviceConfig.cs
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/DeviceConfig.cs
@@ -1,35 +1,35 @@
-using System;
-using System.Collections.Generic;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronIO;
-using Crestron.SimplSharpPro;
-
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using PepperDash.Core;
-using PepperDash.Essentials.Core;
-
-namespace PepperDash.Essentials.Core.Config
-{
- public class DeviceConfig
- {
- [JsonProperty("key")]
- public string Key { get; set; }
-
- [JsonProperty("uid")]
- public int Uid { get; set; }
-
- [JsonProperty("name")]
- public string Name { get; set; }
-
- [JsonProperty("group")]
- public string Group { get; set; }
-
- [JsonProperty("type")]
- public string Type { get; set; }
-
- [JsonProperty("properties")]
- [JsonConverter(typeof(DevicePropertiesConverter))]
+using System;
+using System.Collections.Generic;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronIO;
+using Crestron.SimplSharpPro;
+
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using PepperDash.Core;
+using PepperDash.Essentials.Core;
+
+namespace PepperDash.Essentials.Core.Config
+{
+ public class DeviceConfig
+ {
+ [JsonProperty("key")]
+ public string Key { get; set; }
+
+ [JsonProperty("uid")]
+ public int Uid { get; set; }
+
+ [JsonProperty("name")]
+ public string Name { get; set; }
+
+ [JsonProperty("group")]
+ public string Group { get; set; }
+
+ [JsonProperty("type")]
+ public string Type { get; set; }
+
+ [JsonProperty("properties")]
+ [JsonConverter(typeof(DevicePropertiesConverter))]
public JToken Properties { get; set; }
public DeviceConfig(DeviceConfig dc)
@@ -39,39 +39,42 @@ namespace PepperDash.Essentials.Core.Config
Name = dc.Name;
Group = dc.Group;
Type = dc.Type;
- Properties = JToken.FromObject(dc.Properties);
+
+ Properties = JToken.Parse(dc.Properties.ToString());
+
+ //Properties = JToken.FromObject(dc.Properties);
}
public DeviceConfig() {}
- }
-
- ///
- ///
- ///
- public class DevicePropertiesConverter : JsonConverter
- {
-
- public override bool CanConvert(Type objectType)
- {
- return objectType == typeof(JToken);
- }
-
- public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
- {
- return JToken.ReadFrom(reader);
- }
-
- public override bool CanWrite
- {
- get
- {
- return false;
- }
- }
-
- public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
- {
- throw new NotImplementedException("SOD OFF HOSER");
- }
- }
+ }
+
+ ///
+ ///
+ ///
+ public class DevicePropertiesConverter : JsonConverter
+ {
+
+ public override bool CanConvert(Type objectType)
+ {
+ return objectType == typeof(JToken);
+ }
+
+ public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+ {
+ return JToken.ReadFrom(reader);
+ }
+
+ public override bool CanWrite
+ {
+ get
+ {
+ return false;
+ }
+ }
+
+ public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+ {
+ throw new NotImplementedException("SOD OFF HOSER");
+ }
+ }
}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/ReconfigurableDevice.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/ReconfigurableDevice.cs
index 3239e192..a54f728d 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/ReconfigurableDevice.cs
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Devices/ReconfigurableDevice.cs
@@ -59,7 +59,7 @@ namespace PepperDash.Essentials.Core.Devices
///
/// Used by the extending class to allow for any custom actions to be taken (tell the ConfigWriter to write config, etc)
///
- ///
+ ///
protected virtual void CustomSetConfig(DeviceConfig config)
{
ConfigWriter.UpdateDeviceConfig(config);
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
index c0903526..252a881e 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj
@@ -338,7 +338,9 @@
-
+
+
+
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronGlobalSecretsProvider.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronGlobalSecretsProvider.cs
new file mode 100644
index 00000000..5adefd9e
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronGlobalSecretsProvider.cs
@@ -0,0 +1,102 @@
+using System;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronDataStore;
+using PepperDash.Core;
+
+
+namespace PepperDash.Essentials.Core
+{
+ public class CrestronGlobalSecretsProvider : ISecretProvider
+ {
+ public string Key { get; set; }
+ //Added for reference
+ public string Description { get; private set; }
+
+ public CrestronGlobalSecretsProvider(string key)
+ {
+ Key = key;
+ Description = String.Format("Default secret provider serving all local applications");
+
+ }
+
+ static CrestronGlobalSecretsProvider()
+ {
+ //Added for future encrypted reference
+ var secureSupported = CrestronSecureStorage.Supported;
+
+ CrestronDataStoreStatic.InitCrestronDataStore();
+ if (secureSupported)
+ {
+ //doThingsFuture
+ }
+ }
+
+ ///
+ /// Set secret for item in the CrestronSecretsProvider
+ ///
+ /// Secret Key
+ /// Secret Value
+ public bool SetSecret(string key, object value)
+ {
+ var secret = value as string;
+ CrestronDataStore.CDS_ERROR returnCode;
+
+ if (String.IsNullOrEmpty(secret))
+ {
+ returnCode = CrestronDataStoreStatic.clearGlobal(key);
+ if (returnCode == CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
+ {
+ Debug.Console(0, this, "Successfully removed secret \"{0}\"", secret);
+ return true;
+ }
+ }
+
+ else
+ {
+ returnCode = CrestronDataStoreStatic.SetGlobalStringValue(key, secret);
+ if (returnCode == CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
+ {
+ Debug.Console(0, this, "Successfully set secret \"{0}\"", secret);
+ return true;
+ }
+ }
+
+ Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Unable to set secret for {0}:{1} - {2}", Key, key, returnCode.ToString());
+ return false;
+ }
+
+ ///
+ /// Retrieve secret for item in the CrestronSecretsProvider
+ ///
+ /// Secret Key
+ /// ISecret Object containing key, provider, and value
+ public ISecret GetSecret(string key)
+ {
+ string mySecret;
+ var getErrorCode = CrestronDataStoreStatic.GetGlobalStringValue(key, out mySecret);
+
+ switch (getErrorCode)
+ {
+ case CrestronDataStore.CDS_ERROR.CDS_SUCCESS:
+ Debug.Console(2, this, "Secret Successfully retrieved for {0}:{1}", Key, key);
+ return new CrestronSecret(key, mySecret, this);
+ default:
+ Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Unable to retrieve secret for {0}:{1} - {2}",
+ Key, key, getErrorCode.ToString());
+ return null;
+ }
+ }
+
+ ///
+ /// Determine if a secret is present within the provider without retrieving it
+ ///
+ /// Secret Key
+ /// bool if present
+ public bool TestSecret(string key)
+ {
+ string mySecret;
+ return CrestronDataStoreStatic.GetGlobalStringValue(key, out mySecret) == CrestronDataStore.CDS_ERROR.CDS_SUCCESS;
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronSecretsProvider.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronLocalSecretsProvider.cs
similarity index 52%
rename from essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronSecretsProvider.cs
rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronLocalSecretsProvider.cs
index 3e0a5964..955c875c 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronSecretsProvider.cs
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronLocalSecretsProvider.cs
@@ -1,97 +1,103 @@
-using System;
-using Crestron.SimplSharp;
-using Crestron.SimplSharp.CrestronDataStore;
-using PepperDash.Core;
-
-
-namespace PepperDash.Essentials.Core
-{
- public class CrestronSecretsProvider : ISecretProvider
- {
- public string Key { get; set; }
- //Added for reference
- private static readonly bool SecureSupported;
- public CrestronSecretsProvider(string key)
- {
- Key = key;
- }
-
- static CrestronSecretsProvider()
- {
- //Added for future encrypted reference
- SecureSupported = CrestronSecureStorage.Supported;
-
- CrestronDataStoreStatic.InitCrestronDataStore();
- if (SecureSupported)
- {
- //doThingsFuture
- }
- }
-
- ///
- /// Set secret for item in the CrestronSecretsProvider
- ///
- /// Secret Key
- /// Secret Value
- public bool SetSecret(string key, object value)
- {
- var secret = value as string;
- if (String.IsNullOrEmpty(secret))
- {
- Debug.Console(2, this, "Unable to set secret for {0}:{1} - value is empty.", Key, key);
- return false;
- }
- var setErrorCode = CrestronDataStoreStatic.SetLocalStringValue(key, secret);
- switch (setErrorCode)
- {
- case CrestronDataStore.CDS_ERROR.CDS_SUCCESS:
- Debug.Console(1, this,"Secret Successfully Set for {0}:{1}", Key, key);
- return true;
- default:
- Debug.Console(2, this, Debug.ErrorLogLevel.Notice, "Unable to set secret for {0}:{1} - {2}", Key, key, setErrorCode.ToString());
- return false;
- }
- }
-
- ///
- /// Retrieve secret for item in the CrestronSecretsProvider
- ///
- /// Secret Key
- /// ISecret Object containing key, provider, and value
- public ISecret GetSecret(string key)
- {
- string mySecret;
- var getErrorCode = CrestronDataStoreStatic.GetLocalStringValue(key, out mySecret);
-
- switch (getErrorCode)
- {
- case CrestronDataStore.CDS_ERROR.CDS_SUCCESS:
- Debug.Console(2, this, "Secret Successfully retrieved for {0}:{1}", Key, key);
- return new CrestronSecret(key, mySecret, this);
- default:
- Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Unable to retrieve secret for {0}:{1} - {2}",
- Key, key, getErrorCode.ToString());
- return null;
- }
- }
- }
-
- ///
- /// Special container class for CrestronSecret provider
- ///
- public class CrestronSecret : ISecret
- {
- public ISecretProvider Provider { get; private set; }
- public string Key { get; private set; }
-
- public object Value { get; private set; }
-
- public CrestronSecret(string key, string value, ISecretProvider provider)
- {
- Key = key;
- Value = value;
- Provider = provider;
- }
-
- }
+using System;
+using Crestron.SimplSharp;
+using Crestron.SimplSharp.CrestronDataStore;
+using PepperDash.Core;
+using Crestron.SimplSharpPro;
+
+
+namespace PepperDash.Essentials.Core
+{
+ public class CrestronLocalSecretsProvider : ISecretProvider
+ {
+ public string Key { get; set; }
+ //Added for reference
+ public string Description { get; private set; }
+
+
+ public CrestronLocalSecretsProvider(string key)
+ {
+ Key = key;
+ Description = String.Format("Default secret provider serving Essentials Application {0}", InitialParametersClass.ApplicationNumber);
+ }
+
+ static CrestronLocalSecretsProvider()
+ {
+ //Added for future encrypted reference
+ var secureSupported = CrestronSecureStorage.Supported;
+
+ CrestronDataStoreStatic.InitCrestronDataStore();
+ if (secureSupported)
+ {
+ //doThingsFuture
+ }
+ }
+
+ ///
+ /// Set secret for item in the CrestronSecretsProvider
+ ///
+ /// Secret Key
+ /// Secret Value
+ public bool SetSecret(string key, object value)
+ {
+ var secret = value as string;
+ CrestronDataStore.CDS_ERROR returnCode;
+
+ if (String.IsNullOrEmpty(secret))
+ {
+ returnCode = CrestronDataStoreStatic.clearLocal(key);
+ if (returnCode == CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
+ {
+ Debug.Console(0, this, "Successfully removed secret \"{0}\"", secret);
+ return true;
+ }
+ }
+
+ else
+ {
+ returnCode = CrestronDataStoreStatic.SetLocalStringValue(key, secret);
+ if (returnCode == CrestronDataStore.CDS_ERROR.CDS_SUCCESS)
+ {
+ Debug.Console(0, this, "Successfully set secret \"{0}\"", secret);
+ return true;
+ }
+ }
+
+ Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Unable to set secret for {0}:{1} - {2}", Key, key, returnCode.ToString());
+ return false;
+ }
+
+ ///
+ /// Retrieve secret for item in the CrestronSecretsProvider
+ ///
+ /// Secret Key
+ /// ISecret Object containing key, provider, and value
+ public ISecret GetSecret(string key)
+ {
+ string mySecret;
+ var getErrorCode = CrestronDataStoreStatic.GetLocalStringValue(key, out mySecret);
+
+ switch (getErrorCode)
+ {
+ case CrestronDataStore.CDS_ERROR.CDS_SUCCESS:
+ Debug.Console(2, this, "Secret Successfully retrieved for {0}:{1}", Key, key);
+ return new CrestronSecret(key, mySecret, this);
+ default:
+ Debug.Console(0, this, Debug.ErrorLogLevel.Notice, "Unable to retrieve secret for {0}:{1} - {2}",
+ Key, key, getErrorCode.ToString());
+ return null;
+ }
+ }
+
+ ///
+ /// Determine if a secret is present within the provider without retrieving it
+ ///
+ /// Secret Key
+ /// bool if present
+ public bool TestSecret(string key)
+ {
+ string mySecret;
+ return CrestronDataStoreStatic.GetLocalStringValue(key, out mySecret) == CrestronDataStore.CDS_ERROR.CDS_SUCCESS;
+ }
+ }
+
}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronSecret.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronSecret.cs
new file mode 100644
index 00000000..27fbcdad
--- /dev/null
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/CrestronSecret.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Crestron.SimplSharp;
+
+namespace PepperDash.Essentials.Core
+{
+ ///
+ /// Special container class for CrestronSecret provider
+ ///
+ public class CrestronSecret : ISecret
+ {
+ public ISecretProvider Provider { get; private set; }
+ public string Key { get; private set; }
+
+ public object Value { get; private set; }
+
+ public CrestronSecret(string key, string value, ISecretProvider provider)
+ {
+ Key = key;
+ Value = value;
+ Provider = provider;
+ }
+
+ }
+
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/Interfaces.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/Interfaces.cs
index 43c6a230..e61ac208 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/Interfaces.cs
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/Interfaces.cs
@@ -7,9 +7,32 @@ namespace PepperDash.Essentials.Core
///
public interface ISecretProvider : IKeyed
{
+ ///
+ /// Set secret value for provider by key
+ ///
+ /// key of secret to set
+ /// value to set secret to
+ ///
bool SetSecret(string key, object value);
+ ///
+ /// Return object containing secret from provider
+ ///
+ /// key of secret to retrieve
+ ///
ISecret GetSecret(string key);
+
+ ///
+ /// Verifies presence of secret
+ ///
+ /// key of secret to chek
+ ///
+ bool TestSecret(string key);
+
+ ///
+ /// Description of the secrets provider
+ ///
+ string Description { get; }
}
///
@@ -17,8 +40,19 @@ namespace PepperDash.Essentials.Core
///
public interface ISecret
{
+ ///
+ /// Instance of ISecretProvider that the secret belongs to
+ ///
ISecretProvider Provider { get; }
+
+ ///
+ /// Key of the secret in the provider
+ ///
string Key { get; }
+
+ ///
+ /// Value of the secret
+ ///
object Value { get; }
}
}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/SecretsManager.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/SecretsManager.cs
index bcb46ff5..95a94a24 100644
--- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/SecretsManager.cs
+++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Secrets/SecretsManager.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using Crestron.SimplSharp;
using PepperDash.Core;
-
namespace PepperDash.Essentials.Core
{
public static class SecretsManager
@@ -16,18 +16,28 @@ namespace PepperDash.Essentials.Core
public static void Initialize()
{
- AddSecretProvider("default", new CrestronSecretsProvider("default"));
+ AddSecretProvider("default", new CrestronLocalSecretsProvider("default"));
+
+ AddSecretProvider("CrestronGlobalSecrets", new CrestronGlobalSecretsProvider("CrestronGlobalSecrets"));
CrestronConsole.AddNewConsoleCommand(SetSecretProcess, "setsecret",
- "Adds secrets to secret provider",
+ "Adds secret to secrets provider",
ConsoleAccessLevelEnum.AccessOperator);
CrestronConsole.AddNewConsoleCommand(UpdateSecretProcess, "updatesecret",
- "Updates secrets in secret provider",
+ "Updates secret in secrets provider",
ConsoleAccessLevelEnum.AccessAdministrator);
CrestronConsole.AddNewConsoleCommand(DeleteSecretProcess, "deletesecret",
- "Deletes secrets in secret provider",
+ "Deletes secret from secrest provider",
+ ConsoleAccessLevelEnum.AccessAdministrator);
+
+ CrestronConsole.AddNewConsoleCommand(ListProviders, "secretproviderlist",
+ "Return list of all valid secrets providers",
+ ConsoleAccessLevelEnum.AccessAdministrator);
+
+ CrestronConsole.AddNewConsoleCommand(GetProviderInfo, "secretproviderinfo",
+ "Return data about secrets provider",
ConsoleAccessLevelEnum.AccessAdministrator);
}
@@ -54,6 +64,79 @@ namespace PepperDash.Essentials.Core
return secret;
}
+ public static void GetProviderInfo(string cmd)
+ {
+ string response;
+ var args = cmd.Split(' ');
+
+ if (cmd.Length == 0 || (args.Length == 1 && args[0] == "?"))
+ {
+ response = "Returns data about secrets provider. Format 'secretproviderinfo '";
+ CrestronConsole.ConsoleCommandResponse(response);
+ return;
+
+ }
+
+ if (args.Length == 1)
+ {
+ var provider = GetSecretProviderByKey(args[0]);
+
+ if (provider == null)
+ {
+ response = "Invalid secrets provider key";
+ CrestronConsole.ConsoleCommandResponse(response);
+ return;
+ }
+
+ response = String.Format("{0} : {1}", provider.Key, provider.Description);
+ CrestronConsole.ConsoleCommandResponse(response);
+ return;
+ }
+
+ response = "Improper number of arguments";
+ CrestronConsole.ConsoleCommandResponse(response);
+
+ }
+
+
+ ///
+ /// Console Command that returns all valid secrets in the essentials program.
+ ///
+ ///
+ public static void ListProviders(string cmd)
+ {
+ var response = String.Empty;
+ var args = cmd.Split(' ');
+
+ if (cmd.Length == 0)
+ {
+ if (Secrets != null && Secrets.Count > 0)
+ {
+ response = Secrets.Aggregate(response,
+ (current, secretProvider) => current + (secretProvider.Key + "\n\r"));
+ }
+ else
+ {
+ response = "No Secrets Providers Available";
+ }
+ CrestronConsole.ConsoleCommandResponse(response);
+ return;
+
+ }
+
+ if (args.Length == 1 && args[0] == "?")
+ {
+ response = "Reports all valid and preset Secret providers";
+ CrestronConsole.ConsoleCommandResponse(response);
+ return;
+ }
+
+
+ response = "Improper number of arguments";
+ CrestronConsole.ConsoleCommandResponse(response);
+
+ }
+
///
/// Add secret provider to secrets dictionary
///
@@ -100,14 +183,14 @@ namespace PepperDash.Essentials.Core
if (args.Length == 0)
{
//some Instructional Text
- response = "Adds secrets to secret provider. Format 'setsecret ";
+ response = "Adds secrets to secret provider. Format 'setsecret '";
CrestronConsole.ConsoleCommandResponse(response);
return;
}
if (args.Length == 1 && args[0] == "?")
{
- response = "Adds secrets to secret provider. Format 'setsecret ";
+ response = "Adds secrets to secret provider. Format 'setsecret '";
CrestronConsole.ConsoleCommandResponse(response);
return;
}
@@ -134,23 +217,7 @@ namespace PepperDash.Essentials.Core
var key = args[1];
var secret = args[2];
- if (provider.GetSecret(key) == null)
- {
-
- response = provider.SetSecret(key, secret)
- ? String.Format(
- "Secret successfully set for {0}:{1}",
- provider.Key, key)
- : String.Format(
- "Unable to set secret for {0}:{1}",
- provider.Key, key);
- CrestronConsole.ConsoleCommandResponse(response);
- return;
- }
- response =
- String.Format(
- "Unable to set secret for {0}:{1} - Please use the 'UpdateSecret' command to modify it");
- CrestronConsole.ConsoleCommandResponse(response);
+ CrestronConsole.ConsoleCommandResponse(SetSecret(provider, key, secret));
}
private static void UpdateSecretProcess(string cmd)
@@ -161,7 +228,7 @@ namespace PepperDash.Essentials.Core
if (args.Length == 0)
{
//some Instructional Text
- response = "Updates secrets in secret provider. Format 'updatesecret ";
+ response = "Updates secrets in secret provider. Format 'updatesecret '";
CrestronConsole.ConsoleCommandResponse(response);
return;
@@ -169,7 +236,7 @@ namespace PepperDash.Essentials.Core
if (args.Length == 1 && args[0] == "?")
{
- response = "Updates secrets in secret provider. Format 'updatesecret ";
+ response = "Updates secrets in secret provider. Format 'updatesecret '";
CrestronConsole.ConsoleCommandResponse(response);
return;
}
@@ -198,23 +265,49 @@ namespace PepperDash.Essentials.Core
var key = args[1];
var secret = args[2];
- if (provider.GetSecret(key) != null)
- {
- response = provider.SetSecret(key, secret)
- ? String.Format(
- "Secret successfully set for {0}:{1}",
- provider.Key, key)
- : String.Format(
- "Unable to set secret for {0}:{1}",
- provider.Key, key);
- CrestronConsole.ConsoleCommandResponse(response);
- return;
- }
+ CrestronConsole.ConsoleCommandResponse(UpdateSecret(provider, key, secret));
+
+ }
+
+ private static string UpdateSecret(ISecretProvider provider, string key, string secret)
+ {
+ var secretPresent = provider.TestSecret(key);
+
+ Debug.Console(2, provider, "SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
+
+ if (!secretPresent)
+ return
+ String.Format(
+ "Unable to update secret for {0}:{1} - Please use the 'SetSecret' command to modify it");
+ var response = provider.SetSecret(key, secret)
+ ? String.Format(
+ "Secret successfully set for {0}:{1}",
+ provider.Key, key)
+ : String.Format(
+ "Unable to set secret for {0}:{1}",
+ provider.Key, key);
+ return response;
+ }
+
+ private static string SetSecret(ISecretProvider provider, string key, string secret)
+ {
+ var secretPresent = provider.TestSecret(key);
+
+ Debug.Console(2, provider, "SecretsProvider {0} {1} contain a secret entry for {2}", provider.Key, secretPresent ? "does" : "does not", key);
+
+ if (secretPresent)
+ return
+ String.Format(
+ "Unable to set secret for {0}:{1} - Please use the 'UpdateSecret' command to modify it");
+ var response = provider.SetSecret(key, secret)
+ ? String.Format(
+ "Secret successfully set for {0}:{1}",
+ provider.Key, key)
+ : String.Format(
+ "Unable to set secret for {0}:{1}",
+ provider.Key, key);
+ return response;
- response =
- String.Format(
- "Unable to update secret for {0}:{1} - Please use the 'SetSecret' command to create a new secret");
- CrestronConsole.ConsoleCommandResponse(response);
}
private static void DeleteSecretProcess(string cmd)
@@ -225,14 +318,14 @@ namespace PepperDash.Essentials.Core
if (args.Length == 0)
{
//some Instructional Text
- response = "Deletes secrets in secret provider. Format 'deletesecret ";
+ response = "Deletes secrets in secret provider. Format 'deletesecret '";
CrestronConsole.ConsoleCommandResponse(response);
return;
}
if (args.Length == 1 && args[0] == "?")
{
- response = "Deletes secrets in secret provider. Format 'deletesecret ";
+ response = "Deletes secrets in secret provider. Format 'deletesecret '";
CrestronConsole.ConsoleCommandResponse(response);
return;
}
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
index fe4d5f61..547e8711 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.csproj
@@ -108,6 +108,7 @@
+
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
index c9e584d3..0bca7181 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
@@ -1023,20 +1023,25 @@ ConnectorID: {2}"
if (tempPresets.Count > 0)
{
// Create temporary list to store the existing items from the CiscoCodecStatus.RoomPreset collection
- List existingRoomPresets = new List();
+ var existingRoomPresets = new List();
// Add the existing items to the temporary list
existingRoomPresets.AddRange(CodecStatus.Status.RoomPreset);
// Populate the CodecStatus object (this will append new values to the RoomPreset collection
JsonConvert.PopulateObject(response, CodecStatus);
- JObject jResponse = JObject.Parse(response);
+ var jResponse = JObject.Parse(response);
+
+ List convertedRoomPresets =
+ existingRoomPresets.Select(a => (CiscoCodecStatus.RoomPreset) a).ToList();
IList roomPresets = jResponse["Status"]["RoomPreset"].Children().ToList();
// Iterate the new items in this response agains the temporary list. Overwrite any existing items and add new ones.
- foreach (var preset in tempPresets)
+ foreach (var camPreset in tempPresets)
{
+ var preset = camPreset as CiscoCodecStatus.RoomPreset;
+ if (preset == null) continue;
// First fine the existing preset that matches the id
- var existingPreset = existingRoomPresets.FirstOrDefault(p => p.id.Equals(preset.id));
+ var existingPreset = convertedRoomPresets.FirstOrDefault(p => p.id.Equals(preset.id));
if (existingPreset != null)
{
Debug.Console(1, this, "Existing Room Preset with ID: {0} found. Updating.", existingPreset.id);
@@ -1068,7 +1073,7 @@ ConnectorID: {2}"
CodecStatus.Status.RoomPreset = existingRoomPresets;
// Generecise the list
- NearEndPresets = RoomPresets.GetGenericPresets(CodecStatus.Status.RoomPreset);
+ NearEndPresets = existingRoomPresets.GetGenericPresets();
var handler = CodecRoomPresetsListHasChanged;
if (handler != null)
@@ -2465,20 +2470,6 @@ ConnectorID: {2}"
}
- ///
- /// Represents a codec command that might need to have a friendly label applied for UI feedback purposes
- ///
- public class CodecCommandWithLabel
- {
- public string Command { get; set; }
- public string Label { get; set; }
-
- public CodecCommandWithLabel(string command, string label)
- {
- Command = command;
- Label = label;
- }
- }
///
/// Tracks the initial sycnronization state of the codec when making a connection
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/RoomPresets.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/RoomPresets.cs
index b6327d52..4fec0d89 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/RoomPresets.cs
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/RoomPresets.cs
@@ -1,14 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using Crestron.SimplSharp;
-
-using Newtonsoft.Json;
using PepperDash.Core;
using PepperDash.Essentials.Core.Presets;
-using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
namespace PepperDash.Essentials.Devices.Common.VideoCodec
{
@@ -33,39 +28,17 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
public static class RoomPresets
{
///
- /// Converts Cisco RoomPresets to generic CameraPresets
+ /// Converts non-generic RoomPresets to generic CameraPresets
///
///
///
- public static List GetGenericPresets(List presets)
+ public static List GetGenericPresets(this List presets)
{
- var cameraPresets = new List();
-
- if (Debug.Level > 0)
- {
- Debug.Console(1, "Presets List:");
- }
-
- foreach (CiscoCodecStatus.RoomPreset preset in presets)
- {
- try
- {
- var cameraPreset = new CodecRoomPreset(UInt16.Parse(preset.id), preset.Description.Value, preset.Defined.BoolValue, true);
-
- cameraPresets.Add(cameraPreset);
-
- if (Debug.Level > 0)
- {
- Debug.Console(1, "Added Preset ID: {0}, Description: {1}, IsDefined: {2}, isDefinable: {3}", cameraPreset.ID, cameraPreset.Description, cameraPreset.Defined, cameraPreset.IsDefinable);
- }
- }
- catch (Exception e)
- {
- Debug.Console(2, "Unable to convert preset: {0}. Error: {1}", preset.id, e);
- }
- }
-
- return cameraPresets;
+ return
+ presets.Select(preset => preset.ConvertCodecPreset())
+ .Where(newPreset => newPreset != null)
+ .Cast()
+ .ToList();
}
}
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs
index 5bde30ff..23e8c6ab 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/xStatus.cs
@@ -9,6 +9,7 @@ using Newtonsoft.Json.Linq;
using PepperDash.Core;
using PepperDash.Essentials.Devices.Common.VideoCodec.CiscoCodec;
+using PepperDash.Essentials.Core.Presets;
namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
{
@@ -2185,7 +2186,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
}
}
- public class RoomPreset
+ public class RoomPreset : IConvertiblePreset
{
public string id { get; set; }
public Defined Defined { get; set; }
@@ -2198,7 +2199,24 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
Description = new Description2();
Type = new Type5();
}
- }
+
+ public PresetBase ConvertCodecPreset()
+ {
+ try
+ {
+ var preset = new CodecRoomPreset(UInt16.Parse(id), Description.Value, Defined.BoolValue, true);
+
+ Debug.Console(2, "Preset ID {0} Converted from Cisco Codec Preset to Essentials Preset");
+
+ return preset;
+ }
+ catch (Exception e)
+ {
+ Debug.Console(2, "Unable to convert preset: {0}. Error: {1}", id, e);
+ return null;
+ }
+ }
+}
@@ -2222,7 +2240,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
public Proximity Proximity { get; set; }
public RoomAnalytics RoomAnalytics { get; set; }
- public List RoomPreset { get; set; }
+ public List RoomPreset { get; set; }
public SIP SIP { get; set; }
public Security Security { get; set; }
@@ -2239,7 +2257,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
Standby = new Standby();
Cameras = new Cameras();
RoomAnalytics = new RoomAnalytics();
- RoomPreset = new List();
+ RoomPreset = new List();
Conference = new Conference2();
SystemUnit = new SystemUnit();
Video = new Video();
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/IConvertiblePreset.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/IConvertiblePreset.cs
new file mode 100644
index 00000000..f6f3f74f
--- /dev/null
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/IConvertiblePreset.cs
@@ -0,0 +1,9 @@
+using PepperDash.Essentials.Core.Presets;
+
+namespace PepperDash.Essentials.Devices.Common.VideoCodec
+{
+ public interface IConvertiblePreset
+ {
+ PresetBase ConvertCodecPreset();
+ }
+}
\ No newline at end of file
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasCodecLayouts.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasCodecLayouts.cs
index ef0bf2bd..bfc43db6 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasCodecLayouts.cs
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasCodecLayouts.cs
@@ -22,6 +22,26 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
void MinMaxLayoutToggle();
}
+ ///
+ /// Defines the required elements for layout control with direct layout selection
+ ///
+ public interface IHasCodecLayoutsAvailable : IHasCodecLayouts
+ {
+
+ event EventHandler AvailableLayoutsChanged;
+
+ StringFeedback AvailableLocalLayoutsFeedback { get; }
+ List AvailableLocalLayouts { get; }
+ void LocalLayoutSet(string layout);
+ void LocalLayoutSet(CodecCommandWithLabel layout);
+
+ }
+
+ public class AvailableLayoutChangedEventArgs : EventArgs
+ {
+ public List AvailableLayouts { get; set; }
+ }
+
///
/// Defines the requirements for Zoom Room layout control
///
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs
index 5360b80a..d0ba25fd 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasSelfviewPosition.cs
@@ -1,5 +1,5 @@
using PepperDash.Essentials.Core;
-using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
+using PepperDash.Essentials.Devices.Common.VideoCodec;
namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
{
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasSelfviewSize.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasSelfviewSize.cs
index 91ac3ec8..4103fa0e 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasSelfviewSize.cs
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/Interfaces/IHasSelfviewSize.cs
@@ -1,4 +1,4 @@
-using PepperDash.Essentials.Devices.Common.VideoCodec.Cisco;
+using PepperDash.Essentials.Devices.Common.VideoCodec;
namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
{
diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
index 593472e9..c7579f0b 100644
--- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
+++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/VideoCodecBase.cs
@@ -370,6 +370,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
LinkVideoCodecCameraLayoutsToApi(codec as IHasCodecLayouts, trilist, joinMap);
}
+ if (codec is IHasCodecLayoutsAvailable)
+ {
+ LinkVideoCodecAvailableLayoutsToApi(codec as IHasCodecLayoutsAvailable, trilist, joinMap);
+ }
+
if (codec is IHasSelfviewPosition)
{
LinkVideoCodecSelfviewPositionToApi(codec as IHasSelfviewPosition, trilist, joinMap);
@@ -1471,6 +1476,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
codec.LocalLayoutFeedback.LinkInputSig(trilist.StringInput[joinMap.CurrentLayoutStringFb.JoinNumber]);
}
+ private void LinkVideoCodecAvailableLayoutsToApi(IHasCodecLayoutsAvailable codec, BasicTriList trilist,
+ VideoCodecControllerJoinMap joinMap)
+ {
+ codec.AvailableLocalLayoutsFeedback.LinkInputSig(trilist.StringInput[joinMap.AvailableLayoutsFb.JoinNumber]);
+
+ trilist.SetStringSigAction(joinMap.SelectLayout.JoinNumber, codec.LocalLayoutSet);
+ }
+
private void LinkVideoCodecCameraModeToApi(IHasCameraAutoMode codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
{
trilist.SetSigFalseAction(joinMap.CameraModeAuto.JoinNumber, codec.CameraAutoModeOn);
@@ -1982,4 +1995,19 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
}
}
}
+ ///
+ /// Represents a codec command that might need to have a friendly label applied for UI feedback purposes
+ ///
+ public class CodecCommandWithLabel
+ {
+ public string Command { get; private set; }
+ public string Label { get; private set; }
+
+ public CodecCommandWithLabel(string command, string label)
+ {
+ Command = command;
+ Label = label;
+ }
+ }
+
}
\ No newline at end of file