diff --git a/src/PepperDash.Core/Logging/DebugContext.cs b/src/PepperDash.Core/Logging/DebugContext.cs
index e90ec86a3..66e63634e 100644
--- a/src/PepperDash.Core/Logging/DebugContext.cs
+++ b/src/PepperDash.Core/Logging/DebugContext.cs
@@ -11,6 +11,7 @@ namespace PepperDash.Core
///
/// Represents a debugging context
///
+ [Obsolete("DebugContext is no longer supported and will be removed in a future release.")]
public class DebugContext
{
///
diff --git a/src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs b/src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs
index f8c815fd7..131430a2c 100644
--- a/src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs
+++ b/src/PepperDash.Core/WebApi/Presets/WebApiPasscodeClient.cs
@@ -1,5 +1,5 @@
using System;
-using Crestron.SimplSharp; // For Basic SIMPL# Classes
+using Crestron.SimplSharp; // For Basic SIMPL# Classes
using Crestron.SimplSharp.CrestronIO;
using Crestron.SimplSharp.Net.Http;
using Crestron.SimplSharp.Net.Https;
@@ -10,24 +10,25 @@
namespace PepperDash.Core.WebApi.Presets
{
- ///
- /// Passcode client for the WebApi
- ///
+ ///
+ /// Passcode client for the WebApi
+ ///
+ [Obsolete("WebApiPasscodeClient is no longer supported and will be removed in a future release.")]
public class WebApiPasscodeClient : IKeyed
{
- ///
- /// Notifies when user received
- ///
+ ///
+ /// Notifies when user received
+ ///
public event EventHandler UserReceived;
- ///
- /// Notifies when Preset received
- ///
+ ///
+ /// Notifies when Preset received
+ ///
public event EventHandler PresetReceived;
- ///
- /// Gets or sets the Key
- ///
+ ///
+ /// Gets or sets the Key
+ ///
public string Key { get; private set; }
//string JsonMasterKey;
@@ -54,13 +55,13 @@ public WebApiPasscodeClient()
{
}
- ///
- /// Initializes the instance
- ///
- ///
- ///
- ///
- ///
+ ///
+ /// Initializes the instance
+ ///
+ ///
+ ///
+ ///
+ ///
public void Initialize(string key, string jsonMasterKey, string urlBase, string defaultPresetJsonFilePath)
{
Key = key;
@@ -73,44 +74,44 @@ public void Initialize(string key, string jsonMasterKey, string urlBase, string
J2SMaster.Initialize(jsonMasterKey);
}
- ///
- /// Gets the user for a passcode
- ///
- ///
- ///
- /// GetUserForPasscode method
- ///
+ ///
+ /// Gets the user for a passcode
+ ///
+ ///
+ ///
+ /// GetUserForPasscode method
+ ///
public void GetUserForPasscode(string passcode)
{
- // Bullshit duplicate code here... These two cases should be the same
- // except for https/http and the certificate ignores
- if (!UrlBase.StartsWith("https"))
- return;
- var req = new HttpsClientRequest();
- req.Url = new UrlParser(UrlBase + "/api/users/dopin");
- req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
- req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
- req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
- var jo = new JObject();
- jo.Add("pin", passcode);
- req.ContentString = jo.ToString();
+ // Bullshit duplicate code here... These two cases should be the same
+ // except for https/http and the certificate ignores
+ if (!UrlBase.StartsWith("https"))
+ return;
+ var req = new HttpsClientRequest();
+ req.Url = new UrlParser(UrlBase + "/api/users/dopin");
+ req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
+ req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
+ req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
+ var jo = new JObject();
+ jo.Add("pin", passcode);
+ req.ContentString = jo.ToString();
- var client = new HttpsClient();
- client.HostVerification = false;
- client.PeerVerification = false;
- var resp = client.Dispatch(req);
- var handler = UserReceived;
- if (resp.Code == 200)
- {
- //CrestronConsole.PrintLine("Received: {0}", resp.ContentString);
- var user = JsonConvert.DeserializeObject(resp.ContentString);
- CurrentUser = user;
- if (handler != null)
- UserReceived(this, new UserReceivedEventArgs(user, true));
- }
- else
- if (handler != null)
- UserReceived(this, new UserReceivedEventArgs(null, false));
+ var client = new HttpsClient();
+ client.HostVerification = false;
+ client.PeerVerification = false;
+ var resp = client.Dispatch(req);
+ var handler = UserReceived;
+ if (resp.Code == 200)
+ {
+ //CrestronConsole.PrintLine("Received: {0}", resp.ContentString);
+ var user = JsonConvert.DeserializeObject(resp.ContentString);
+ CurrentUser = user;
+ if (handler != null)
+ handler(this, new UserReceivedEventArgs(user, true));
+ }
+ else
+ if (handler != null)
+ handler(this, new UserReceivedEventArgs(null, false));
}
///
@@ -118,9 +119,9 @@ public void GetUserForPasscode(string passcode)
///
///
///
- ///
- /// GetPresetForThisUser method
- ///
+ ///
+ /// GetPresetForThisUser method
+ ///
public void GetPresetForThisUser(int roomTypeId, int presetNumber)
{
if (CurrentUser == null)
@@ -136,57 +137,57 @@ public void GetPresetForThisUser(int roomTypeId, int presetNumber)
PresetNumber = presetNumber
};
- var handler = PresetReceived;
+ var handler = PresetReceived;
try
{
- if (!UrlBase.StartsWith("https"))
- return;
- var req = new HttpsClientRequest();
- req.Url = new UrlParser(UrlBase + "/api/presets/userandroom");
- req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
- req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
- req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
- req.ContentString = JsonConvert.SerializeObject(msg);
+ if (!UrlBase.StartsWith("https"))
+ return;
+ var req = new HttpsClientRequest();
+ req.Url = new UrlParser(UrlBase + "/api/presets/userandroom");
+ req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
+ req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json"));
+ req.Header.AddHeader(new HttpsHeader("Accept", "application/json"));
+ req.ContentString = JsonConvert.SerializeObject(msg);
- var client = new HttpsClient();
- client.HostVerification = false;
- client.PeerVerification = false;
+ var client = new HttpsClient();
+ client.HostVerification = false;
+ client.PeerVerification = false;
- // ask for the preset
- var resp = client.Dispatch(req);
- if (resp.Code == 200) // got it
- {
- //Debug.Console(1, this, "Received: {0}", resp.ContentString);
- var preset = JsonConvert.DeserializeObject(resp.ContentString);
- CurrentPreset = preset;
+ // ask for the preset
+ var resp = client.Dispatch(req);
+ if (resp.Code == 200) // got it
+ {
+ //Debug.Console(1, this, "Received: {0}", resp.ContentString);
+ var preset = JsonConvert.DeserializeObject(resp.ContentString);
+ CurrentPreset = preset;
- //if there's no preset data, load the template
- if (preset.Data == null || preset.Data.Trim() == string.Empty || JObject.Parse(preset.Data).Count == 0)
- {
- //Debug.Console(1, this, "Loaded preset has no data. Loading default template.");
- LoadDefaultPresetData();
- return;
- }
+ //if there's no preset data, load the template
+ if (preset.Data == null || preset.Data.Trim() == string.Empty || JObject.Parse(preset.Data).Count == 0)
+ {
+ //Debug.Console(1, this, "Loaded preset has no data. Loading default template.");
+ LoadDefaultPresetData();
+ return;
+ }
- J2SMaster.LoadWithJson(preset.Data);
- if (handler != null)
- PresetReceived(this, new PresetReceivedEventArgs(preset, true));
- }
- else // no existing preset
- {
- CurrentPreset = new Preset();
- LoadDefaultPresetData();
- if (handler != null)
- PresetReceived(this, new PresetReceivedEventArgs(null, false));
- }
+ J2SMaster.LoadWithJson(preset.Data);
+ if (handler != null)
+ handler(this, new PresetReceivedEventArgs(preset, true));
+ }
+ else // no existing preset
+ {
+ CurrentPreset = new Preset();
+ LoadDefaultPresetData();
+ if (handler != null)
+ handler(this, new PresetReceivedEventArgs(null, false));
+ }
}
catch (HttpException e)
{
var resp = e.Response;
Debug.Console(1, this, "No preset received (code {0}). Loading default template", resp.Code);
LoadDefaultPresetData();
- if (handler != null)
- PresetReceived(this, new PresetReceivedEventArgs(null, false));
+ if (handler != null)
+ PresetReceived(this, new PresetReceivedEventArgs(null, false));
}
}
@@ -218,14 +219,14 @@ void LoadDefaultPresetData()
///
///
///
- ///
- /// SavePresetForThisUser method
- ///
+ ///
+ /// SavePresetForThisUser method
+ ///
public void SavePresetForThisUser(int roomTypeId, int presetNumber)
{
if (CurrentPreset == null)
LoadDefaultPresetData();
- //return;
+ //return;
//// A new preset needs to have its numbers set
//if (CurrentPreset.IsNewPreset)
@@ -245,8 +246,8 @@ void SaveCallback(string json)
{
CurrentPreset.Data = json;
- if (!UrlBase.StartsWith("https"))
- return;
+ if (!UrlBase.StartsWith("https"))
+ return;
var req = new HttpsClientRequest();
req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post;
req.Url = new UrlParser(string.Format("{0}/api/presets/addorchange", UrlBase));
@@ -255,8 +256,8 @@ void SaveCallback(string json)
req.ContentString = JsonConvert.SerializeObject(CurrentPreset);
var client = new HttpsClient();
- client.HostVerification = false;
- client.PeerVerification = false;
+ client.HostVerification = false;
+ client.PeerVerification = false;
try
{
var resp = client.Dispatch(req);
diff --git a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs
index 9df673bfc..2ba33df0d 100644
--- a/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs
+++ b/src/PepperDash.Essentials.Core/Config/Essentials/ConfigUpdater.cs
@@ -19,6 +19,7 @@ namespace PepperDash.Essentials.Core.Config
///
/// ConfigUpdater class
///
+ [Obsolete("ConfigUpdater is no longer supported and will be removed in a future release.")]
public static class ConfigUpdater
{
///
@@ -81,7 +82,7 @@ static void OnStatusUpdate(eUpdateStatus status)
{
var handler = ConfigStatusChanged;
- if(handler != null)
+ if (handler != null)
{
handler(typeof(ConfigUpdater), new ConfigStatusEventArgs(status));
}
@@ -89,7 +90,7 @@ static void OnStatusUpdate(eUpdateStatus status)
static void WriteConfigToFile(string configData)
{
- var filePath = Global.FilePathPrefix+ "configurationFile-updated.json";
+ var filePath = Global.FilePathPrefix + "configurationFile-updated.json";
try
{
@@ -104,7 +105,7 @@ static void WriteConfigToFile(string configData)
Debug.LogMessage(LogEventLevel.Debug, "Error parsing new config: {0}", e);
OnStatusUpdate(eUpdateStatus.UpdateFailed);
- }
+ }
}
///
@@ -149,11 +150,11 @@ static void MoveFilesToArchiveFolder(FileInfo[] files)
// Directory exists, first clear any contents
var archivedConfigFiles = ConfigReader.GetConfigFiles(archiveDirectoryPath + Global.DirectorySeparator + Global.ConfigFileName + ".bak");
- if(archivedConfigFiles != null || archivedConfigFiles.Length > 0)
+ if (archivedConfigFiles != null && archivedConfigFiles.Length > 0)
{
Debug.LogMessage(LogEventLevel.Information, "{0} Existing files found in archive folder. Deleting.", archivedConfigFiles.Length);
- for (int i = 0; i < archivedConfigFiles.Length; i++ )
+ for (int i = 0; i < archivedConfigFiles.Length; i++)
{
var file = archivedConfigFiles[i];
Debug.LogMessage(LogEventLevel.Information, "Deleting archived file: '{0}'", file.FullName);
@@ -170,9 +171,9 @@ static void MoveFilesToArchiveFolder(FileInfo[] files)
// Moves the file and appends the .bak extension
var fileDest = archiveDirectoryPath + "/" + file.Name + ".bak";
- if(!File.Exists(fileDest))
+ if (!File.Exists(fileDest))
{
- file.MoveTo(fileDest);
+ file.MoveTo(fileDest);
}
else
Debug.LogMessage(LogEventLevel.Information, "Cannot move file to archive folder. Existing file already exists with same name: '{0}'", fileDest);
@@ -207,15 +208,15 @@ static void RestartProgram()
CrestronConsole.SendControlSystemCommand(string.Format("progreset -p:{0}", InitialParametersClass.ApplicationNumber), ref response);
- Debug.LogMessage(LogEventLevel.Debug, "Console Response: {0}", response);
+ Debug.LogMessage(LogEventLevel.Debug, "Console Response: {0}", response);
}
}
- ///
- /// Enumeration of eUpdateStatus values
- ///
- public enum eUpdateStatus
+ ///
+ /// Enumeration of eUpdateStatus values
+ ///
+ public enum eUpdateStatus
{
///
/// UpdateStarted status
diff --git a/src/PepperDash.Essentials.Core/Interfaces/ILogStrings.cs b/src/PepperDash.Essentials.Core/Interfaces/ILogStrings.cs
index d55194fde..b41a90205 100644
--- a/src/PepperDash.Essentials.Core/Interfaces/ILogStrings.cs
+++ b/src/PepperDash.Essentials.Core/Interfaces/ILogStrings.cs
@@ -7,9 +7,10 @@
namespace PepperDash.Essentials.Core.Interfaces
{
- ///
- /// Defines the contract for ILogStrings
- ///
+ ///
+ /// Defines the contract for ILogStrings
+ ///
+ [Obsolete("ILogStrings is no longer supported and will be removed in a future release.")]
public interface ILogStrings : IKeyed
{
///
diff --git a/src/PepperDash.Essentials.Core/Interfaces/ILogStringsWithLevel.cs b/src/PepperDash.Essentials.Core/Interfaces/ILogStringsWithLevel.cs
index bb835919b..32ef104a3 100644
--- a/src/PepperDash.Essentials.Core/Interfaces/ILogStringsWithLevel.cs
+++ b/src/PepperDash.Essentials.Core/Interfaces/ILogStringsWithLevel.cs
@@ -7,15 +7,16 @@
namespace PepperDash.Essentials.Core.Interfaces
{
- ///
- /// Defines the contract for ILogStringsWithLevel
- ///
+ ///
+ /// Defines the contract for ILogStringsWithLevel
+ ///
+ [Obsolete("ILogStringsWithLevel is no longer supported and will be removed in a future release.")]
public interface ILogStringsWithLevel : IKeyed
{
///
/// Defines a class that is capable of logging a string with an int level
///
- void SendToLog(IKeyed device, Debug.ErrorLogLevel level,string logMessage);
+ void SendToLog(IKeyed device, Debug.ErrorLogLevel level, string logMessage);
}
}
\ No newline at end of file
diff --git a/src/PepperDash.Essentials.Core/Routing/eRoutingSignalType.cs b/src/PepperDash.Essentials.Core/Routing/eRoutingSignalType.cs
index 9fce9c5bb..708b7448f 100644
--- a/src/PepperDash.Essentials.Core/Routing/eRoutingSignalType.cs
+++ b/src/PepperDash.Essentials.Core/Routing/eRoutingSignalType.cs
@@ -27,16 +27,19 @@ public enum eRoutingSignalType
///
/// Control signal type
///
+ [Obsolete("UsbOutput is no longer supported and will be removed in a future release.")]
UsbOutput = 8,
///
/// Control signal type
///
+ [Obsolete("UsbInput is no longer supported and will be removed in a future release.")]
UsbInput = 16,
///
/// Secondary audio signal type
///
+ [Obsolete("SecondaryAudio is no longer supported and will be removed in a future release.")]
SecondaryAudio = 32
}
}
\ No newline at end of file
diff --git a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs
index 126bcd273..f383dd0a0 100644
--- a/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs
+++ b/src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs
@@ -17,6 +17,8 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
///
/// Represents a CameraVisca
///
+ [Obsolete("CameraVisca is no longer supported and will be removed in a future release. Use the CameraVisca plugin instead.")]
+
public class CameraVisca : CameraBase, IHasCameraPtzControl, ICommunicationMonitor, IHasCameraPresets, IHasPowerControlWithFeedback, IBridgeAdvanced, IHasCameraFocusControl, IHasAutoFocusMode
{
private readonly CameraViscaPropertiesConfig PropertiesConfig;
diff --git a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceStateMessageBase.cs b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceStateMessageBase.cs
index 87f19e3fa..a5df51a84 100644
--- a/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceStateMessageBase.cs
+++ b/src/PepperDash.Essentials.MobileControl.Messengers/Messengers/DeviceStateMessageBase.cs
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using Newtonsoft.Json;
@@ -18,6 +19,7 @@ public class DeviceStateMessageBase : DeviceMessageBase
/// Sets the interfaces implemented by the device sending the message
///
///
+ [Obsolete("SetInterfaces is no longer supported and will be removed in a future release. Interfaces for all devices are now retrieved via the /joinroom endpoint in the MobileControlWebsocketServer")]
public void SetInterfaces(List interfaces)
{
Interfaces = interfaces;
diff --git a/src/PepperDash.Essentials/ControlSystem.cs b/src/PepperDash.Essentials/ControlSystem.cs
index 5a0ba2afd..47de4d3ec 100644
--- a/src/PepperDash.Essentials/ControlSystem.cs
+++ b/src/PepperDash.Essentials/ControlSystem.cs
@@ -801,6 +801,7 @@ public void LoadRooms()
///
/// Fires up a logo server if not already running
///
+ [Obsolete("Logo server is no longer supported and will be removed in a future release.")]
void LoadLogoServer()
{
if (ConfigReader.ConfigObject?.Rooms == null)