diff --git a/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json b/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json index 918fe73f..3fb02ce8 100644 --- a/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json +++ b/Example Configuration/SIMPLBridging/SIMPLBridgeExample_configurationFile.json @@ -1,8 +1,6 @@ { "system_url": "", - "template": {}, - "template_url": "", - "system": { + "template": { "info": { "comment": "", "requiredControlSofwareVersion": "", @@ -434,5 +432,8 @@ "rooms": [], "sourceLists": {}, "tieLines": [] + }, + "template_url": "", + "system": { } } \ No newline at end of file diff --git a/Example Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json b/Example Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json index df791e3d..de6d6fa4 100644 --- a/Example Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json +++ b/Example Configuration/SIMPLBridging/configurationFile-dmps3300c-avRouting.json @@ -1,9 +1,6 @@ { "system_url": "", - "template": { - }, - "template_url": "", - "system": { + "template": { "info": { "comment": "", "requiredControlSofwareVersion": "", @@ -64,6 +61,10 @@ }, "tieLines": [ - ] + ] + }, + "template_url": "", + "system": { + } } \ No newline at end of file diff --git a/PepperDashEssentials/PepperDashEssentials.csproj b/PepperDashEssentials/PepperDashEssentials.csproj index 82ebc282..f808a708 100644 --- a/PepperDashEssentials/PepperDashEssentials.csproj +++ b/PepperDashEssentials/PepperDashEssentials.csproj @@ -189,7 +189,6 @@ - diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/GenericHttpClient.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/GenericHttpClient.cs similarity index 98% rename from essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/GenericHttpClient.cs rename to essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/GenericHttpClient.cs index 53b4efd6..830b10e1 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/GenericHttpClient.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Config/Comm and IR/GenericHttpClient.cs @@ -7,7 +7,7 @@ using Crestron.SimplSharp.Net.Http; using PepperDash.Core; using PepperDash.Core.DebugThings; -namespace PepperDash.Essentials.Devices.Common +namespace PepperDash.Essentials.Core { public class GenericHttpClient : Device, IBasicCommunication { diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj index 587159a2..815f6658 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.csproj @@ -113,6 +113,7 @@ + diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs index 36c655d2..318268f1 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/DSP/DspBase.cs @@ -62,7 +62,6 @@ namespace PepperDash.Essentials.Devices.Common.DSP /// In BiAmp: Instance Tag, QSC: Named Control, Polycom: /// string ControlPointTag { get; } -#warning I dont think index1 and index2 should be a part of the interface. JTA 2018-07-17 int Index1 { get; } int Index2 { get; } bool HasMute { get; } 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 bed83feb..6b57d1ca 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 @@ -112,11 +112,6 @@ - - - - - diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertsEndpointStatusServer.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertsEndpointStatusServer.cs deleted file mode 100644 index 5867b51a..00000000 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertsEndpointStatusServer.cs +++ /dev/null @@ -1,152 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using PepperDash.Core; -using PepperDash.Essentials.Core; -using System.Text.RegularExpressions; -using Crestron.SimplSharp.Net.Http; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using Newtonsoft.Json.Serialization; - -using Crestron.SimplSharp.CrestronSockets; - - -namespace PepperDash.Essentials.Devices.Common -{ - - /***** - * TODO JTA: Add Polling - * TODO JTA: Move all the registration commnads to the EvertEndpoint class. - * - * - * - * - * - */ - - public class EvertzEndpointStatusServer : Device - { - public IBasicCommunication Communication { get; private set; } - public CommunicationGather PortGather { get; private set; } - public StatusMonitorBase CommunicationMonitor { get; private set; } - public bool isSubscribed; - public string Address; - public GenericUdpServer Server; - - - - /// - /// Shows received lines as hex - /// - public bool ShowHexResponse { get; set; } - public Dictionary Endpoints; - public Dictionary ServerIdByEndpointIp; - - public EvertzEndpointStatusServer(string key, string name, GenericUdpServer server, EvertzEndpointStatusServerPropertiesConfig props) : - base(key, name) - { - Server = server; - Address = props.serverHostname; - Server.DataRecievedExtra += new EventHandler(_Server_DataRecievedExtra); - - Server.Connect(); - Endpoints = new Dictionary(); - - //CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler); - } - - - - //TODO JTA: Move this method and process over to the endpoint itself. return a bool. - public bool RegisterEvertzEndpoint (EvertzEndpoint device) - { - - if (Endpoints.ContainsKey(device.Address) == false) - { - Endpoints.Add(device.Address, device); - } - - return true; - } - - - - - void _Server_DataRecievedExtra(object sender, GenericUdpReceiveTextExtraArgs e) - { - Debug.Console(2, this, "_Server_DataRecievedExtra:\nIP:{0}\nPort:{1}\nText{2}\nBytes:{3} ", e.IpAddress, e.Port, e.Text, e.Bytes); - } - - public override bool CustomActivate() - { - /* - Communication.Connect(); - CommunicationMonitor.StatusChange += (o, a) => { Debug.Console(2, this, "Communication monitor state: {0}", CommunicationMonitor.Status); }; - CommunicationMonitor.Start(); - */ - - - - - - return true; - } - - } - - - - - - - - - - - - public class EvertzPortRestResponse - { - public string id; - public string name; - public string type; - public string value; - - } - - public class EvertsStatusRequesstResponse - { - public EvertzStatusDataResponse data; - public string error; - } - - public class EvertzStatusDataResponse - { - public List servers; - } - - public class EvertzServerStatusResponse - { - public string id; - public string name; - public EvertsServerStausNotificationsResponse notify; - - } - public class EvertsServerStausNotificationsResponse - { - public string ip; - public List parameters; - public string port; - public string protocol; - } - public class EvertzEndpointStatusServerPropertiesConfig - { - - public ControlPropertiesConfig control { get; set; } - public string serverHostname { get; set; } - - } - - } diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertzEndpoint.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertzEndpoint.cs deleted file mode 100644 index 7ab504d1..00000000 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertzEndpoint.cs +++ /dev/null @@ -1,337 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; -using PepperDash.Core; -using PepperDash.Essentials.Core; -using System.Text.RegularExpressions; -using Crestron.SimplSharp.Net.Http; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - - -namespace PepperDash.Essentials.Devices.Common -{ - - public class EvertzEndpoint : Device - { - - - - public IBasicCommunication Communication { get; private set; } - public CommunicationGather PortGather { get; private set; } - public GenericCommunicationMonitor CommunicationMonitor { get; private set; } - - private GenericHttpClient Client; - public string userName; - public string password; - public string Address; - private bool OnlineStatus; - public BoolFeedback OnlineFeedback; - public IntFeedback PresetFeedback; - - - public bool isSubscribed; - - - - CrestronQueue CommandQueue; - - public Dictionary Ports; - - private string _ControllerKey; - - - private EvertzEndpointStatusServer StatusServer; - private String StatusServerId; - - /// - /// Shows received lines as hex - /// - public bool ShowHexResponse { get; set; } - - public EvertzEndpoint(string key, string name, EvertzEndpointPropertiesConfig props, string type) : - base(key, name) - { - - - this.Address = props.address; - Client = new GenericHttpClient(string.Format("{0}-GenericWebClient", name), string.Format("{0}-GenericWebClient", name), this.Address); - Client.ResponseRecived += new EventHandler(Client_ResponseRecived); - Ports = new Dictionary(); - if (type.ToLower() == "mma10g-trs4k") - { - //create port hdmi 01 - EvertzEndpointPort hdmi1 = new EvertzEndpointPort("HDMI01", "131.0@s", "136.0@s"); - EvertzEndpointPort hdmi2 = new EvertzEndpointPort("HDMI02", "131.1@s", "136.1@s"); - // add to dictionay with all keys - addPortToDictionary(hdmi1); - addPortToDictionary(hdmi2); - } - _ControllerKey = null; - if (props.controllerKey != null) - { - _ControllerKey = props.controllerKey; - } - AddPostActivationAction( () => {PostActivation();}); - CrestronEnvironment.ProgramStatusEventHandler += new ProgramStatusEventHandler(CrestronEnvironment_ProgramStatusEventHandler); - if (props.CommunicationMonitorProperties != null) - { - CommunicationMonitor = new GenericCommunicationMonitor(this, Client, props.CommunicationMonitorProperties); - } - else - { - CommunicationMonitor = new GenericCommunicationMonitor(this, Client, 40000, 120000, 300000, "v.api/apis/EV/SERVERSTATUS"); - } - - - } - - /// - /// Helper method - /// - /// - private void addPortToDictionary(EvertzEndpointPort port) - { - Ports.Add(port.PortName, port); - Ports.Add(port.ResolutionVarID, port); - Ports.Add(port.SyncVarID, port); - //PollForState(port.SyncVarID); - //PollForState(port.ResolutionVarID); - } - - /// - /// - /// - /// - public override bool CustomActivate() - { - - // Create Device -> Constructor fires - // PreActivations get called - // CustomActivate Gets Called Anything that is involved with this single class Ex: Connection, Setup Feedback, Etc. - // After this point all devices are ready for interaction - // PostActivation gets called. Use this for interClass activation. - CommunicationMonitor.Start(); - OnlineFeedback = new BoolFeedback(() => { return OnlineStatus; }); - - - //CrestronConsole.AddNewConsoleCommand(SendLine, "send" + Key, "", ConsoleAccessLevelEnum.AccessOperator); - return true; - } - - /// - /// - /// - private void PostActivation() - { - Debug.Console(2, this, "EvertzEndpoint Post Activation"); - if (_ControllerKey != null) - { - StatusServer = DeviceManager.GetDeviceForKey(_ControllerKey) as EvertzEndpointStatusServer; - StatusServer.RegisterEvertzEndpoint(this); - - // RegisterStatusServer(); - // SendStatusRequest(); - } - // PollAll(); - } - - void CrestronEnvironment_ProgramStatusEventHandler(eProgramStatusEventType programEventType) - { - if (programEventType == eProgramStatusEventType.Stopping) - { - Debug.Console(1, this, "Program stopping. Disabling EvertzStatusServer"); - if (StatusServerId != null) - { - //UnregisterServer(); - } - } - } - - private void ProcessServerStatusRequest(EvertsStatusRequesstResponse status) - { - // var status = JsonConvert.DeserializeObject(SendStatusRequest()); - if (status.error != null) - { - - } - else if (status.data != null) - { - foreach (var server in status.data.servers) - { - if (server.name == string.Format("{0}-{1}", this.Name, StatusServer.Address)) - { - StatusServerId = server.id; - Debug.Console(2, this, "EvertzEndpoint {0} StatusServer {1} Registered ID {2}", Name, StatusServer.Name, StatusServerId); - /* - - foreach (var port in Ports) - { - // TODO JTA: This needs a better check - // you get a {"status": "success"} or "error": "error to register notification- Variable exists.." - if (!server.notify.parameters.Contains(port.Value.ResolutionVarID)) - { - RegisterForNotification(StatusServerId, port.Value.ResolutionVarID); - } - if (!server.notify.parameters.Contains(port.Value.ResolutionVarID)) - { - RegisterForNotification(StatusServerId, port.Value.SyncVarID); - } - } - */ - - break; - } - } - StatusServerId = null; - } - } - private void RegisterServerWithEndpoint() - { - /* - var registrationResult = RegisterServer(StatusServer.Address, string.Format("{0}-{1}", this.Name, StatusServer.Address), StatusServer.Server.Port.ToString()); - Debug.Console(2, this, "EvertzEndpointStatusServer Registration Result with device {0}\n{1}", Address, registrationResult); - if (registrationResult.Contains("success")) - { - RegisterStatusServer(); - } - else - { - Debug.Console(0, this, "EvertzEndpointStatusServer RegisterServerWithEndpoint with device {0}\n{1}", Address, registrationResult); - - } - * */ - } - - public void PollAll() - { - string collection = ""; - foreach (var parameter in Ports) - { - if (parameter.Key.Contains("@")) - { - collection = collection + parameter.Key + ","; - } - } - collection = collection.Substring(0, collection.Length - 1); - SendGetRequest(collection); - } - public void PollForState(string varId) - { - try - { - SendGetRequest(varId); - //var returnState = JsonConvert.DeserializeObject(SendGetRequest(varId)); - - } - catch (Exception e) - { - Debug.Console(0, this, "PollForState {0}", e); - - } - } - - - public void ProcessGetParameterResponse(EvertzPortRestResponse response) - { - var PortObject = Ports[response.id]; - if (response.name == "Input Status") - { - if (response.value == "Missing") { PortObject.SyncDetected = false; } - else { PortObject.SyncDetected = true; } - } - } - public void SendGetRequest(string s) - { - Client.SendText("v.api/apis/EV/GET/parameter/{0}", s); - } - - public void SendStatusRequest() - { - Client.SendText("/v.api/apis/EV/SERVERSTATUS"); - } - public void RegisterServer(string hostname, string servername, string port) - { - Client.SendText("v.api/apis/EV/SERVERADD/server/{0}/{1}/{2}/udp", hostname, servername, port); - } - public void UnregisterServer() - { - if (StatusServerId != null) - { - Client.SendTextNoResponse("v.api/apis/EV/SERVERDEL/server/{0}", StatusServerId); - } - } - - // TODO JTA: Craete a UnregisterServerFast using DispatchASync. - public void RegisterForNotification(string varId) - { - Client.SendText("v.api/apis/EV/NOTIFYADD/parameter/{0}/{1}", StatusServerId, varId); - } - - - void Client_ResponseRecived(object sender, GenericHttpClientEventArgs e) - { - if (e.Error == HTTP_CALLBACK_ERROR.COMPLETED) - { - if (e.RequestPath.Contains("GET/parameter/")) - { - // Get Parameter response - if (!e.ResponseText.Contains("[")) - ProcessGetParameterResponse(JsonConvert.DeserializeObject(e.ResponseText)); - else if (e.ResponseText.Contains("[")) - { - List test = JsonConvert.DeserializeObject>(e.ResponseText); - foreach (var thing in test) - { - ProcessGetParameterResponse(thing); - } - - } - } - else if (e.RequestPath.Contains("SERVERSTATUS")) - { - PollAll(); - ProcessServerStatusRequest(JsonConvert.DeserializeObject(e.ResponseText)); - } - } - } - - - - - public class EvertzPortsRestResponse - { - List test; - } - public class EvertzPortRestResponse - { - public string id; - public string name; - public string type; - public string value; - - } - - public class EvertzEndpointPort - { - public string PortName; - public string SyncVarID; - public string ResolutionVarID; - public bool SyncDetected; - public string Resolution; - public BoolFeedback SyncDetectedFeedback; - - public EvertzEndpointPort (string portName, string syncVarId, string resolutionVarId) - { - PortName = portName; - SyncVarID = syncVarId; - ResolutionVarID = resolutionVarId; - SyncDetectedFeedback = new BoolFeedback(() => { return SyncDetected; }); - } - - } - - } -} \ No newline at end of file diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertzEndpointPropertiesConfig.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertzEndpointPropertiesConfig.cs deleted file mode 100644 index 5beff4df..00000000 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertzEndpointPropertiesConfig.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - -using PepperDash.Core; -using PepperDash.Essentials.Core; - -namespace PepperDash.Essentials.Devices.Common -{ - /// - /// - /// - public class EvertzEndpointPropertiesConfig - { - public CommunicationMonitorConfig CommunicationMonitorProperties { get; set; } - - public ControlPropertiesConfig Control { get; set; } - public string userName { get; set; } - public string password { get; set; } - public string address { get; set; } - public string controllerKey { get; set; } - } - -} \ No newline at end of file diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertzEndpointVarIds.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertzEndpointVarIds.cs deleted file mode 100644 index fc5200f1..00000000 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Evertz/EvertzEndpointVarIds.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Crestron.SimplSharp; - -namespace PepperDash.Essentials.Devices.Common -{ - public class EvertzEndpointVarIds - { - private string HdmiPort01SyncStatus = "136.0"; - } -} \ No newline at end of file diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs index 004a2579..48179ff1 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Factory/DeviceFactory.cs @@ -107,21 +107,6 @@ namespace PepperDash.Essentials.Devices.Common properties.ToString()); return new DigitalLogger(key, name, props); } - else if (groupName == "evertzendpoint") - { - // var comm = CommFactory.CreateCommForDevice(dc); - var props = JsonConvert.DeserializeObject( - properties.ToString()); - return new EvertzEndpoint(key, name, props, typeName); - } - else if (typeName == "evertzendpointstatusserver") - { - var server = CommFactory.CreateCommForDevice(dc) as GenericUdpServer; - - var props = JsonConvert.DeserializeObject( - properties.ToString()); - return new EvertzEndpointStatusServer(key, name, server, props); - } else if (typeName == "genericaudiooutwithvolume") { var zone = dc.Properties.Value("zone"); @@ -395,13 +380,6 @@ namespace PepperDash.Essentials.Devices.Common } } - //else if (typeName == "qscdsp") - //{ - // var comm = CommFactory.CreateCommForDevice(dc); - // var props = JsonConvert.DeserializeObject( - // properties.ToString()); - // return new QscDsp(key, name, comm, props); - //} return null; } diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Power Controllers/Digitallogger.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Power Controllers/Digitallogger.cs index e48a5b7b..358c63cb 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/Power Controllers/Digitallogger.cs +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/Power Controllers/Digitallogger.cs @@ -26,7 +26,7 @@ namespace PepperDash.Essentials.Devices.Common public string address; private bool OnlineStatus; public BoolFeedback OnlineFeedback; - private ushort CurrentPreset; + //private ushort CurrentPreset; public IntFeedback PresetFeedback; public Dictionary CircuitStatus; @@ -103,7 +103,7 @@ namespace PepperDash.Essentials.Devices.Common }); CircuitIsCritical[circuit] = new BoolFeedback(() => { - if (CircuitStatus[circuit].critical != null) + if (CircuitStatus.ContainsKey(circuit)) { return CircuitStatus[circuit].critical; } @@ -114,7 +114,7 @@ namespace PepperDash.Essentials.Devices.Common }); CircuitState[circuit] = new BoolFeedback(() => { - if (CircuitStatus[circuit].state != null) + if (CircuitStatus.ContainsKey(circuit)) { return CircuitStatus[circuit].state; } diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs index 3a78c5e0..c603ca08 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ResponseObjects.cs @@ -979,8 +979,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom meeting.StartTime = b.StartTime; if (b.EndTime != null) meeting.EndTime = b.EndTime; - if (b.IsPrivate != null) - meeting.Privacy = b.IsPrivate ? eMeetingPrivacy.Private : eMeetingPrivacy.Public; + + meeting.Privacy = b.IsPrivate ? eMeetingPrivacy.Private : eMeetingPrivacy.Public; // No meeting.Calls data exists for Zoom Rooms. Leaving out for now. diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs index 4d4ad472..84881df3 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoom.cs @@ -43,8 +43,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom public bool CommDebuggingIsOn; - CTimer LoginMessageReceivedTimer; - CTimer RetryConnectionTimer; + //CTimer LoginMessageReceivedTimer; + //CTimer RetryConnectionTimer; /// /// Gets and returns the scaled volume of the codec diff --git a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs index 32a8296e..209cfdd9 100644 --- a/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs +++ b/essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/ZoomRoom/ZoomRoomCamera.cs @@ -47,13 +47,13 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.ZoomRoom private bool isZooming; - private bool isFocusing; + //private bool isFocusing; private bool isMoving { get { - return isPanning || isTilting || isZooming || isFocusing; + return isPanning || isTilting || isZooming; } }