pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-10 18:24:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: change to use Debug.LogMessage everywhere

Browse Source
This commit is contained in:
Andrew Welker
2024-03-21 13:44:08 -05:00
parent 4d0e3b1943
commit ee4ccb0d1a
110 changed files with 1033 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/PepperDash.Essentials.Devices.Common/Audio/GenericAudioOut.cs
View File

@@ -9,6 +9,7 @@ using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Routing;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common
{
@@ -109,7 +110,7 @@ namespace PepperDash.Essentials.Devices.Common
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new GenericAudioOutWithVolumeFactory Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new GenericAudioOutWithVolumeFactory Device");
var zone = dc.Properties.Value<uint>("zone");
return new GenericAudioOutWithVolume(dc.Key, dc.Name,
dc.Properties.Value<string>("volumeDeviceKey"), zone);

19
src/PepperDash.Essentials.Devices.Common/AudioCodec/MockAC/MockAC.cs
View File

@@ -8,6 +8,7 @@ using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Devices.Common.Codec;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.AudioCodec
{
@@ -25,7 +26,7 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
{
if (!IsInCall)
{
Debug.Console(1, this, "Dial: {0}", number);
Debug.LogMessage(LogEventLevel.Debug, this, "Dial: {0}", number);
var call = new CodecActiveCallItem()
{
Name = "Mock Outgoing Call",
@@ -42,20 +43,20 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
}
else
{
Debug.Console(1, this, "Already in call. Cannot dial new call.");
Debug.LogMessage(LogEventLevel.Debug, this, "Already in call. Cannot dial new call.");
}
}
public override void EndCall(CodecActiveCallItem call)
{
Debug.Console(1, this, "EndCall");
Debug.LogMessage(LogEventLevel.Debug, this, "EndCall");
ActiveCalls.Remove(call);
SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Disconnected, call);
}
public override void EndAllCalls()
{
Debug.Console(1, this, "EndAllCalls");
Debug.LogMessage(LogEventLevel.Debug, this, "EndAllCalls");
for (int i = ActiveCalls.Count - 1; i >= 0; i--)
{
var call = ActiveCalls[i];
@@ -66,20 +67,20 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
public override void AcceptCall(CodecActiveCallItem call)
{
Debug.Console(1, this, "AcceptCall");
Debug.LogMessage(LogEventLevel.Debug, this, "AcceptCall");
SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Connecting, call);
}
public override void RejectCall(CodecActiveCallItem call)
{
Debug.Console(1, this, "RejectCall");
Debug.LogMessage(LogEventLevel.Debug, this, "RejectCall");
ActiveCalls.Remove(call);
SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Disconnected, call);
}
public override void SendDtmf(string s)
{
Debug.Console(1, this, "BEEP BOOP SendDTMF: {0}", s);
Debug.LogMessage(LogEventLevel.Debug, this, "BEEP BOOP SendDTMF: {0}", s);
}
/// <summary>
@@ -88,7 +89,7 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
/// <param name="url"></param>
public void TestIncomingAudioCall(string number)
{
Debug.Console(1, this, "TestIncomingAudioCall from {0}", number);
Debug.LogMessage(LogEventLevel.Debug, this, "TestIncomingAudioCall from {0}", number);
var call = new CodecActiveCallItem() { Name = number, Id = number, Number = number, Type = eCodecCallType.Audio, Direction = eCodecCallDirection.Incoming };
ActiveCalls.Add(call);
SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Ringing, call);
@@ -122,7 +123,7 @@ namespace PepperDash.Essentials.Devices.Common.AudioCodec
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new MockAc Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new MockAc Device");
var props = Newtonsoft.Json.JsonConvert.DeserializeObject<AudioCodec.MockAcPropertiesConfig>(dc.Properties.ToString());
return new AudioCodec.MockAC(dc.Key, dc.Name, props);
}

7
src/PepperDash.Essentials.Devices.Common/Cameras/CameraBase.cs
View File

@@ -17,6 +17,7 @@ using PepperDash.Essentials.Core.Presets;
using PepperDash.Essentials.Devices.Common.Codec;
using Newtonsoft.Json;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Cameras
{
@@ -101,7 +102,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
}
else
{
Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
}
var customJoins = JoinMapHelper.TryGetJoinMapAdvancedForDevice(joinMapKey);
@@ -111,8 +112,8 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
joinMap.SetCustomJoinData(customJoins);
}
Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
Debug.Console(0, "Linking to Bridge Type {0}", cameraDevice.GetType().Name.ToString());
Debug.LogMessage(LogEventLevel.Debug, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
Debug.LogMessage(LogEventLevel.Information, "Linking to Bridge Type {0}", cameraDevice.GetType().Name.ToString());
var commMonitor = cameraDevice as ICommunicationMonitor;
commMonitor.CommunicationMonitor.IsOnlineFeedback.LinkInputSig(

31
src/PepperDash.Essentials.Devices.Common/Cameras/CameraVisca.cs
View File

@@ -15,6 +15,7 @@ using System.Text.RegularExpressions;
using Crestron.SimplSharp.Reflection;
using Newtonsoft.Json;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Cameras
{
@@ -161,7 +162,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
Communication.Connect();
CommunicationMonitor.StatusChange += (o, a) => { Debug.Console(2, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
CommunicationMonitor.StatusChange += (o, a) => { Debug.LogMessage(LogEventLevel.Verbose, this, "Communication monitor state: {0}", CommunicationMonitor.Status); };
CommunicationMonitor.Start();
@@ -176,7 +177,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
void socket_ConnectionChange(object sender, GenericSocketStatusChageEventArgs e)
{
Debug.Console(2, this, "Socket Status Change: {0}", e.Client.ClientStatus.ToString());
Debug.LogMessage(LogEventLevel.Verbose, this, "Socket Status Change: {0}", e.Client.ClientStatus.ToString());
if (e.Client.IsConnected)
{
@@ -193,7 +194,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
{
if (Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
Debug.Console(2, this, "Sending:{0}", ComTextHelper.GetEscapedText(b));
Debug.LogMessage(LogEventLevel.Verbose, this, "Sending:{0}", ComTextHelper.GetEscapedText(b));
Communication.SendBytes(b);
}
@@ -209,7 +210,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
IncomingBuffer.CopyTo(newBytes, 0);
e.Bytes.CopyTo(newBytes, IncomingBuffer.Length);
if (Debug.Level == 2) // This check is here to prevent following string format from building unnecessarily on level 0 or 1
Debug.Console(2, this, "Received:{0}", ComTextHelper.GetEscapedText(newBytes));
Debug.LogMessage(LogEventLevel.Verbose, this, "Received:{0}", ComTextHelper.GetEscapedText(newBytes));
byte[] message = new byte[] { };
@@ -238,7 +239,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
case 0x40:
{
// ACK received
Debug.Console(2, this, "ACK Received");
Debug.LogMessage(LogEventLevel.Verbose, this, "ACK Received");
break;
}
case 0x50:
@@ -247,7 +248,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
if (message[2] == 0xFF)
{
// Completion received
Debug.Console(2, this, "Completion Received");
Debug.LogMessage(LogEventLevel.Verbose, this, "Completion Received");
}
else
{
@@ -260,7 +261,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
}
else
{
Debug.Console(2, this, "Response Queue is empty. Nothing to dequeue.");
Debug.LogMessage(LogEventLevel.Verbose, this, "Response Queue is empty. Nothing to dequeue.");
}
}
@@ -275,37 +276,37 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
case 0x01:
{
// Message Length Error
Debug.Console(2, this, "Error from device: Message Length Error");
Debug.LogMessage(LogEventLevel.Verbose, this, "Error from device: Message Length Error");
break;
}
case 0x02:
{
// Syntax Error
Debug.Console(2, this, "Error from device: Syntax Error");
Debug.LogMessage(LogEventLevel.Verbose, this, "Error from device: Syntax Error");
break;
}
case 0x03:
{
// Command Buffer Full
Debug.Console(2, this, "Error from device: Command Buffer Full");
Debug.LogMessage(LogEventLevel.Verbose, this, "Error from device: Command Buffer Full");
break;
}
case 0x04:
{
// Command Cancelled
Debug.Console(2, this, "Error from device: Command Cancelled");
Debug.LogMessage(LogEventLevel.Verbose, this, "Error from device: Command Cancelled");
break;
}
case 0x05:
{
// No Socket
Debug.Console(2, this, "Error from device: No Socket");
Debug.LogMessage(LogEventLevel.Verbose, this, "Error from device: No Socket");
break;
}
case 0x41:
{
// Command not executable
Debug.Console(2, this, "Error from device: Command not executable");
Debug.LogMessage(LogEventLevel.Verbose, this, "Error from device: Command not executable");
break;
}
}
@@ -327,7 +328,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
}
catch (Exception err)
{
Debug.Console(2, this, "Error parsing feedback: {0}", err);
Debug.LogMessage(LogEventLevel.Verbose, this, "Error parsing feedback: {0}", err);
}
finally
{
@@ -645,7 +646,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new CameraVisca Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new CameraVisca Device");
var comm = CommFactory.CreateCommForDevice(dc);
var props = Newtonsoft.Json.JsonConvert.DeserializeObject<Cameras.CameraViscaPropertiesConfig>(
dc.Properties.ToString());

15
src/PepperDash.Essentials.Devices.Common/Codec/iHasScheduleAwareness.cs
View File

@@ -9,6 +9,7 @@ using Crestron.SimplSharp;
using PepperDash.Core;
using Newtonsoft.Json;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Codec
{
@@ -93,7 +94,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
/// <param name="meeting"></param>
private void OnMeetingChange(eMeetingEventChangeType changeType, Meeting meeting)
{
Debug.Console(2, "*****************OnMeetingChange. id: {0} changeType: {1}**********************", meeting.Id, changeType);
Debug.LogMessage(LogEventLevel.Verbose, "*****************OnMeetingChange. id: {0} changeType: {1}**********************", meeting.Id, changeType);
if (changeType != (changeType & meeting.NotifiedChangeTypes))
{
// Add this change type to the NotifiedChangeTypes
@@ -107,7 +108,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
}
else
{
Debug.Console(2, "Meeting: {0} already notified of changeType: {1}", meeting.Id, changeType);
Debug.LogMessage(LogEventLevel.Verbose, "Meeting: {0} already notified of changeType: {1}", meeting.Id, changeType);
}
}
@@ -127,22 +128,22 @@ namespace PepperDash.Essentials.Devices.Common.Codec
if (eMeetingEventChangeType.MeetingStartWarning != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingStartWarning) && m.TimeToMeetingStart.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes && m.TimeToMeetingStart.Seconds > 0) // Meeting is about to start
{
Debug.Console(2, "********************* MeetingStartWarning. TotalMinutes: {0} Seconds: {1}", m.TimeToMeetingStart.TotalMinutes, m.TimeToMeetingStart.Seconds);
Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingStartWarning. TotalMinutes: {0} Seconds: {1}", m.TimeToMeetingStart.TotalMinutes, m.TimeToMeetingStart.Seconds);
changeType = eMeetingEventChangeType.MeetingStartWarning;
}
else if (eMeetingEventChangeType.MeetingStart != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingStart) && Math.Abs(m.TimeToMeetingStart.TotalMinutes) < meetingTimeEpsilon) // Meeting Start
{
Debug.Console(2, "********************* MeetingStart");
Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingStart");
changeType = eMeetingEventChangeType.MeetingStart;
}
else if (eMeetingEventChangeType.MeetingEndWarning != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingEndWarning) && m.TimeToMeetingEnd.TotalMinutes <= m.MeetingWarningMinutes.TotalMinutes && m.TimeToMeetingEnd.Seconds > 0) // Meeting is about to end
{
Debug.Console(2, "********************* MeetingEndWarning. TotalMinutes: {0} Seconds: {1}", m.TimeToMeetingEnd.TotalMinutes, m.TimeToMeetingEnd.Seconds);
Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingEndWarning. TotalMinutes: {0} Seconds: {1}", m.TimeToMeetingEnd.TotalMinutes, m.TimeToMeetingEnd.Seconds);
changeType = eMeetingEventChangeType.MeetingEndWarning;
}
else if (eMeetingEventChangeType.MeetingEnd != (m.NotifiedChangeTypes & eMeetingEventChangeType.MeetingEnd) && Math.Abs(m.TimeToMeetingEnd.TotalMinutes) < meetingTimeEpsilon) // Meeting has ended
{
Debug.Console(2, "********************* MeetingEnd");
Debug.LogMessage(LogEventLevel.Verbose, "********************* MeetingEnd");
changeType = eMeetingEventChangeType.MeetingEnd;
}
@@ -214,7 +215,7 @@ namespace PepperDash.Essentials.Devices.Common.Codec
{
var joinable = StartTime.AddMinutes(-MinutesBeforeMeeting) <= DateTime.Now
&& DateTime.Now <= EndTime.AddSeconds(-_joinableCooldownSeconds);
//Debug.Console(2, "Meeting Id: {0} joinable: {1}", Id, joinable);
//Debug.LogMessage(LogEventLevel.Verbose, "Meeting Id: {0} joinable: {1}", Id, joinable);
return joinable;
}
}

3
src/PepperDash.Essentials.Devices.Common/DeviceFactory.cs
View File

@@ -5,6 +5,7 @@ using System.Linq;
using Crestron.SimplSharp.Reflection;
using PepperDash.Core;
using PepperDash.Essentials.Core;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common
{
@@ -29,7 +30,7 @@ namespace PepperDash.Essentials.Devices.Common
}
catch (Exception e)
{
Debug.Console(0, Debug.ErrorLogLevel.Error, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
Debug.LogMessage(LogEventLevel.Information, "Unable to load type: '{1}' DeviceFactory: {0}", e, type.Name);
}
}
}

9
src/PepperDash.Essentials.Devices.Common/Displays/BasicIrDisplay.cs
View File

@@ -8,6 +8,7 @@ using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Bridges;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Routing;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Displays
{
@@ -39,8 +40,8 @@ namespace PepperDash.Essentials.Devices.Common.Displays
IrPort = new IrOutputPortController(key + "-ir", port, irDriverFilepath);
DeviceManager.AddDevice(IrPort);
IsWarmingUpFeedback.OutputChange += (o, a) => Debug.Console(2, this, "Warming up={0}", _IsWarmingUp);
IsCoolingDownFeedback.OutputChange += (o, a) => Debug.Console(2, this, "Cooling down={0}", _IsCoolingDown);
IsWarmingUpFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Verbose, this, "Warming up={0}", _IsWarmingUp);
IsCoolingDownFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Verbose, this, "Cooling down={0}", _IsCoolingDown);
InputPorts.AddRange(new RoutingPortCollection<RoutingInputPort>
{
@@ -166,7 +167,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
/// <param name="inputSelector">A delegate containing the input selector method to call</param>
public override void ExecuteSwitch(object inputSelector)
{
Debug.Console(2, this, "Switching to input '{0}'", (inputSelector as Action).ToString());
Debug.LogMessage(LogEventLevel.Verbose, this, "Switching to input '{0}'", (inputSelector as Action).ToString());
Action finishSwitch = () =>
{
@@ -208,7 +209,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new BasicIrDisplay Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new BasicIrDisplay Device");
var ir = IRPortHelper.GetIrPort(dc.Properties);
if (ir != null)
{

15
src/PepperDash.Essentials.Devices.Common/Displays/DisplayBase.cs
View File

@@ -9,6 +9,7 @@ using PepperDash.Essentials.Core.Bridges;
using Feedback = PepperDash.Essentials.Core.Feedback;
using Newtonsoft.Json;
using PepperDash.Essentials.Core.DeviceTypeInterfaces;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Displays
{
@@ -114,7 +115,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
}
else
{
Debug.Console(0,this,"Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
Debug.LogMessage(LogEventLevel.Information,this,"Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
}
LinkDisplayToApi(displayDevice, trilist, joinMap);
@@ -122,8 +123,8 @@ namespace PepperDash.Essentials.Devices.Common.Displays
protected void LinkDisplayToApi(DisplayBase displayDevice, BasicTriList trilist, DisplayControllerJoinMap joinMap)
{
Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
Debug.Console(0, "Linking to Display: {0}", displayDevice.Name);
Debug.LogMessage(LogEventLevel.Debug, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
Debug.LogMessage(LogEventLevel.Information, "Linking to Display: {0}", displayDevice.Name);
trilist.StringInput[joinMap.Name.JoinNumber].StringValue = displayDevice.Name;
@@ -145,7 +146,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
{
trilist.SetBool(joinMap.IsTwoWayDisplay.JoinNumber, true);
twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.Console(0, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
twoWayDisplay.CurrentInputFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Information, "CurrentInputFeedback_OutputChange {0}", a.StringValue);
inputNumberFeedback.LinkInputSig(trilist.UShortInput[joinMap.InputSelect.JoinNumber]);
@@ -199,16 +200,16 @@ namespace PepperDash.Essentials.Devices.Common.Displays
var tempKey = inputKeys.ElementAt(i);
trilist.SetSigTrueAction((ushort)(joinMap.InputSelectOffset.JoinNumber + i),
() => displayDevice.ExecuteSwitch(displayDevice.InputPorts[tempKey].Selector));
Debug.Console(2, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}",
Debug.LogMessage(LogEventLevel.Verbose, displayDevice, "Setting Input Select Action on Digital Join {0} to Input: {1}",
joinMap.InputSelectOffset.JoinNumber + i, displayDevice.InputPorts[tempKey].Key.ToString());
trilist.StringInput[(ushort)(joinMap.InputNamesOffset.JoinNumber + i)].StringValue = displayDevice.InputPorts[i].Key.ToString();
}
else
Debug.Console(0, displayDevice, Debug.ErrorLogLevel.Warning, "Device has {0} inputs. The Join Map allows up to {1} inputs. Discarding inputs {2} - {3} from bridge.",
Debug.LogMessage(LogEventLevel.Information, displayDevice, "Device has {0} inputs. The Join Map allows up to {1} inputs. Discarding inputs {2} - {3} from bridge.",
displayDevice.InputPorts.Count, joinMap.InputNamesOffset.JoinSpan, i + 1, displayDevice.InputPorts.Count);
}
Debug.Console(2, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
Debug.LogMessage(LogEventLevel.Verbose, displayDevice, "Setting Input Select Action on Analog Join {0}", joinMap.InputSelect);
trilist.SetUShortSigAction(joinMap.InputSelect.JoinNumber, (a) =>
{
if (a == 0)

17
src/PepperDash.Essentials.Devices.Common/Displays/MockDisplay.cs
View File

@@ -8,6 +8,7 @@ using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Bridges;
using PepperDash.Essentials.Core.DeviceTypeInterfaces;
using PepperDash.Essentials.Core.Routing;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Displays
{
@@ -25,7 +26,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
{
return () =>
{
Debug.Console(2, this, "*************************************************** Display Power is {0}", _PowerIsOn ? "on" : "off");
Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** Display Power is {0}", _PowerIsOn ? "on" : "off");
return _PowerIsOn;
};
} }
@@ -35,7 +36,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
{
return () =>
{
Debug.Console(2, this, "*************************************************** {0}", _IsCoolingDown ? "Display is cooling down" : "Display has finished cooling down");
Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** {0}", _IsCoolingDown ? "Display is cooling down" : "Display has finished cooling down");
return _IsCoolingDown;
};
}
@@ -46,7 +47,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
{
return () =>
{
Debug.Console(2, this, "*************************************************** {0}", _IsWarmingUp ? "Display is warming up" : "Display has finished warming up");
Debug.LogMessage(LogEventLevel.Verbose, this, "*************************************************** {0}", _IsWarmingUp ? "Display is warming up" : "Display has finished warming up");
return _IsWarmingUp;
};
}
@@ -122,7 +123,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
// Fake cool-down cycle
CooldownTimer = new CTimer(o =>
{
Debug.Console(2, this, "Cooldown timer ending");
Debug.LogMessage(LogEventLevel.Verbose, this, "Cooldown timer ending");
_IsCoolingDown = false;
IsCoolingDownFeedback.InvokeFireUpdate();
_PowerIsOn = false;
@@ -141,7 +142,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
public override void ExecuteSwitch(object selector)
{
Debug.Console(2, this, "ExecuteSwitch: {0}", selector);
Debug.LogMessage(LogEventLevel.Verbose, this, "ExecuteSwitch: {0}", selector);
if (!_PowerIsOn)
{
@@ -167,7 +168,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
if (currentInput != null)
{
Debug.Console(2, this, "SetInput: {0}", selector);
Debug.LogMessage(LogEventLevel.Verbose, this, "SetInput: {0}", selector);
currentInput.IsSelected = false;
}
@@ -214,7 +215,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
{
//while (pressRelease)
//{
Debug.Console(2, this, "Volume Down {0}", pressRelease);
Debug.LogMessage(LogEventLevel.Verbose, this, "Volume Down {0}", pressRelease);
if (pressRelease)
{
var newLevel = _FakeVolumeLevel + VolumeInterval;
@@ -228,7 +229,7 @@ namespace PepperDash.Essentials.Devices.Common.Displays
{
//while (pressRelease)
//{
Debug.Console(2, this, "Volume Up {0}", pressRelease);
Debug.LogMessage(LogEventLevel.Verbose, this, "Volume Up {0}", pressRelease);
if (pressRelease)
{
var newLevel = _FakeVolumeLevel - VolumeInterval;

3
src/PepperDash.Essentials.Devices.Common/Generic/GenericSink.cs
View File

@@ -2,6 +2,7 @@
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Routing;
using Serilog.Events;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -55,7 +56,7 @@ namespace PepperDash.Essentials.Devices.Common.Generic
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new Generic Source Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Source Device");
return new GenericSource(dc.Key, dc.Name);
}
}

3
src/PepperDash.Essentials.Devices.Common/Generic/GenericSource.cs
View File

@@ -10,6 +10,7 @@ using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Routing;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common
{
@@ -50,7 +51,7 @@ namespace PepperDash.Essentials.Devices.Common
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new Generic Source Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Source Device");
return new GenericSource(dc.Key, dc.Name);
}
}

9
src/PepperDash.Essentials.Devices.Common/Lighting/LightingBase.cs
View File

@@ -12,6 +12,7 @@ using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Bridges;
using PepperDash.Essentials.Core.Lighting;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Lighting
{
@@ -43,7 +44,7 @@ namespace PepperDash.Essentials.Devices.Common.Lighting
public void SimulateSceneSelect(string sceneName)
{
Debug.Console(1, this, "Simulating selection of scene '{0}'", sceneName);
Debug.LogMessage(LogEventLevel.Debug, this, "Simulating selection of scene '{0}'", sceneName);
var scene = LightingScenes.FirstOrDefault(s => s.Name.Equals(sceneName));
@@ -91,7 +92,7 @@ namespace PepperDash.Essentials.Devices.Common.Lighting
}
else
{
Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
}
return LinkLightingToApi(lightingDevice, trilist, joinMap);
@@ -99,9 +100,9 @@ namespace PepperDash.Essentials.Devices.Common.Lighting
protected GenericLightingJoinMap LinkLightingToApi(LightingBase lightingDevice, BasicTriList trilist, GenericLightingJoinMap joinMap)
{
Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
Debug.LogMessage(LogEventLevel.Debug, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
Debug.Console(0, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
Debug.LogMessage(LogEventLevel.Information, "Linking to Lighting Type {0}", lightingDevice.GetType().Name.ToString());
// GenericLighitng Actions & FeedBack
trilist.SetUShortSigAction(joinMap.SelectScene.JoinNumber, u => lightingDevice.SelectScene(lightingDevice.LightingScenes[u]));

2
src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
View File

@@ -27,6 +27,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.42" />
<PackageReference Include="PepperDashCore" Version="2.0.0-alpha-393" />
<PackageReference Include="PepperDashCore" Version="2.0.0-beta-400" />
</ItemGroup>
</Project>

9
src/PepperDash.Essentials.Devices.Common/SetTopBox/IRSetTopBoxBase.cs
View File

@@ -15,6 +15,7 @@ using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Presets;
using PepperDash.Essentials.Core.Routing;
using PepperDash.Essentials.Core.DeviceTypeInterfaces;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common
{
@@ -386,11 +387,11 @@ namespace PepperDash.Essentials.Devices.Common
}
else
{
Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
}
Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
Debug.Console(0, "Linking to SetTopBox: {0}", Name);
Debug.LogMessage(LogEventLevel.Debug, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
Debug.LogMessage(LogEventLevel.Information, "Linking to SetTopBox: {0}", Name);
trilist.OnlineStatusChange += new OnlineStatusChangeEventHandler((o, a) =>
{
@@ -504,7 +505,7 @@ namespace PepperDash.Essentials.Devices.Common
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new SetTopBox Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new SetTopBox Device");
var irCont = IRPortHelper.GetIrOutputPortController(dc);
var config = dc.Properties.ToObject<SetTopBoxPropertiesConfig>();
var stb = new IRSetTopBoxBase(dc.Key, dc.Name, irCont, config);

11
src/PepperDash.Essentials.Devices.Common/Shades/RelayControlledShade.cs
View File

@@ -5,6 +5,7 @@ using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.CrestronIO;
using PepperDash.Essentials.Core.Shades;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Shades
{
@@ -47,21 +48,21 @@ namespace PepperDash.Essentials.Devices.Common.Shades
public override void Open()
{
Debug.Console(1, this, "Opening Shade: '{0}'", this.Name);
Debug.LogMessage(LogEventLevel.Debug, this, "Opening Shade: '{0}'", this.Name);
PulseOutput(OpenRelay, RelayPulseTime);
}
public override void Stop()
{
Debug.Console(1, this, "Stopping Shade: '{0}'", this.Name);
Debug.LogMessage(LogEventLevel.Debug, this, "Stopping Shade: '{0}'", this.Name);
PulseOutput(StopOrPresetRelay, RelayPulseTime);
}
public override void Close()
{
Debug.Console(1, this, "Closing Shade: '{0}'", this.Name);
Debug.LogMessage(LogEventLevel.Debug, this, "Closing Shade: '{0}'", this.Name);
PulseOutput(CloseRelay, RelayPulseTime);
}
@@ -87,7 +88,7 @@ namespace PepperDash.Essentials.Devices.Common.Shades
}
else
{
Debug.Console(1, this, "Error: Unable to get relay on port '{0}' from device with key '{1}'", relayConfig.PortNumber, relayConfig.PortDeviceKey);
Debug.LogMessage(LogEventLevel.Debug, this, "Error: Unable to get relay on port '{0}' from device with key '{1}'", relayConfig.PortNumber, relayConfig.PortDeviceKey);
return null;
}
}
@@ -117,7 +118,7 @@ namespace PepperDash.Essentials.Devices.Common.Shades
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new Generic Comm Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Generic Comm Device");
var props = Newtonsoft.Json.JsonConvert.DeserializeObject<RelayControlledShadeConfigProperties>(dc.Properties.ToString());
return new RelayControlledShade(dc.Key, dc.Name, props);

3
src/PepperDash.Essentials.Devices.Common/Shades/ShadeController.cs
View File

@@ -3,6 +3,7 @@ using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Shades;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Shades
{
@@ -63,7 +64,7 @@ namespace PepperDash.Essentials.Devices.Common.Shades
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new ShadeController Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new ShadeController Device");
var props = Newtonsoft.Json.JsonConvert.DeserializeObject<ShadeControllerConfigProperties>(dc.Properties.ToString());
return new ShadeController(dc.Key, dc.Name, props);

13
src/PepperDash.Essentials.Devices.Common/SoftCodec/BlueJeansPc.cs
View File

@@ -7,6 +7,7 @@ using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Routing;
using PepperDash.Essentials.Devices.Common.Sources;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.SoftCodec
@@ -40,19 +41,19 @@ namespace PepperDash.Essentials.Devices.Common.SoftCodec
{
CrestronInvoke.BeginInvoke(o =>
{
Debug.Console(1, this, "Run route action '{0}' on SourceList: {1}", routeKey, sourceListKey);
Debug.LogMessage(LogEventLevel.Debug, this, "Run route action '{0}' on SourceList: {1}", routeKey, sourceListKey);
var dict = ConfigReader.ConfigObject.GetSourceListForKey(sourceListKey);
if (dict == null)
{
Debug.Console(1, this, "WARNING: Config source list '{0}' not found", sourceListKey);
Debug.LogMessage(LogEventLevel.Debug, this, "WARNING: Config source list '{0}' not found", sourceListKey);
return;
}
// Try to get the list item by it's string key
if (!dict.ContainsKey(routeKey))
{
Debug.Console(1, this, "WARNING: No item '{0}' found on config list '{1}'",
Debug.LogMessage(LogEventLevel.Debug, this, "WARNING: No item '{0}' found on config list '{1}'",
routeKey, sourceListKey);
return;
}
@@ -97,7 +98,7 @@ namespace PepperDash.Essentials.Devices.Common.SoftCodec
if (dest == null)
{
Debug.Console(1, this, "Cannot route, unknown destination '{0}'", route.DestinationKey);
Debug.LogMessage(LogEventLevel.Debug, this, "Cannot route, unknown destination '{0}'", route.DestinationKey);
return false;
}
@@ -112,7 +113,7 @@ namespace PepperDash.Essentials.Devices.Common.SoftCodec
var source = DeviceManager.GetDeviceForKey(route.SourceKey) as IRoutingOutputs;
if (source == null)
{
Debug.Console(1, this, "Cannot route unknown source '{0}' to {1}", route.SourceKey, route.DestinationKey);
Debug.LogMessage(LogEventLevel.Debug, this, "Cannot route unknown source '{0}' to {1}", route.SourceKey, route.DestinationKey);
return false;
}
dest.ReleaseAndMakeRoute(source, route.Type);
@@ -169,7 +170,7 @@ namespace PepperDash.Essentials.Devices.Common.SoftCodec
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new BlueJeansPc Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new BlueJeansPc Device");
return new SoftCodec.BlueJeansPc(dc.Key, dc.Name);
}
}

3
src/PepperDash.Essentials.Devices.Common/SoftCodec/GenericSoftCodec.cs
View File

@@ -2,6 +2,7 @@
using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using Serilog.Events;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -73,7 +74,7 @@ namespace PepperDash.Essentials.Devices.Common.SoftCodec
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Attempting to create new Generic SoftCodec Device");
Debug.LogMessage(LogEventLevel.Debug, "Attempting to create new Generic SoftCodec Device");
var props = dc.Properties.ToObject<GenericSoftCodecProperties>();

3
src/PepperDash.Essentials.Devices.Common/Sources/InRoomPc.cs
View File

@@ -4,6 +4,7 @@ using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Routing;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Sources
{
@@ -68,7 +69,7 @@ namespace PepperDash.Essentials.Devices.Common.Sources
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new InRoomPc Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new InRoomPc Device");
return new InRoomPc(dc.Key, dc.Name);
}
}

3
src/PepperDash.Essentials.Devices.Common/Sources/Laptop.cs
View File

@@ -4,6 +4,7 @@ using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Routing;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Sources
{
@@ -68,7 +69,7 @@ namespace PepperDash.Essentials.Devices.Common.Sources
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new Laptop Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Laptop Device");
return new Laptop(dc.Key, dc.Name);
}
}

11
src/PepperDash.Essentials.Devices.Common/Streaming/AppleTV.cs
View File

@@ -14,6 +14,7 @@ using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Bridges;
using PepperDash.Essentials.Core.Routing;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common
{
@@ -45,7 +46,7 @@ namespace PepperDash.Essentials.Devices.Common
foreach (var value in cmds.Select(cmd => cmd.GetValue(null)).OfType<string>())
{
Debug.Console(2, this, "Expected IR Function Name: {0}", value);
Debug.LogMessage(LogEventLevel.Verbose, this, "Expected IR Function Name: {0}", value);
}
}
@@ -173,11 +174,11 @@ namespace PepperDash.Essentials.Devices.Common
}
else
{
Debug.Console(0, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
Debug.LogMessage(LogEventLevel.Information, this, "Please update config to use 'eiscapiadvanced' to get all join map features for this device.");
}
Debug.Console(1, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
Debug.Console(0, "Linking to Bridge Type {0}", GetType().Name);
Debug.LogMessage(LogEventLevel.Debug, "Linking to Trilist '{0}'", trilist.ID.ToString("X"));
Debug.LogMessage(LogEventLevel.Information, "Linking to Bridge Type {0}", GetType().Name);
trilist.SetBoolSigAction(joinMap.UpArrow.JoinNumber, Up);
trilist.SetBoolSigAction(joinMap.DnArrow.JoinNumber, Down);
@@ -198,7 +199,7 @@ namespace PepperDash.Essentials.Devices.Common
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new AppleTV Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new AppleTV Device");
var irCont = IRPortHelper.GetIrOutputPortController(dc);
return new AppleTV(dc.Key, dc.Name, irCont);
}

3
src/PepperDash.Essentials.Devices.Common/Streaming/Roku.cs
View File

@@ -10,6 +10,7 @@ using PepperDash.Core;
using PepperDash.Essentials.Core;
using PepperDash.Essentials.Core.Config;
using PepperDash.Essentials.Core.Routing;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common
{
@@ -157,7 +158,7 @@ namespace PepperDash.Essentials.Devices.Common
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new Roku Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new Roku Device");
var irCont = IRPortHelper.GetIrOutputPortController(dc);
return new Roku2(dc.Key, dc.Name, irCont);

49
src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVC.cs
View File

@@ -16,6 +16,7 @@ using PepperDash.Essentials.Devices.Common.Cameras;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.VideoCodec
{
@@ -50,10 +51,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
DirectoryBrowseHistory = new List<CodecDirectory>();
// Debug helpers
MuteFeedback.OutputChange += (o, a) => Debug.Console(1, this, "Mute={0}", _IsMuted);
PrivacyModeIsOnFeedback.OutputChange += (o, a) => Debug.Console(1, this, "Privacy={0}", _PrivacyModeIsOn);
SharingSourceFeedback.OutputChange += (o, a) => Debug.Console(1, this, "SharingSource={0}", _SharingSource);
VolumeLevelFeedback.OutputChange += (o, a) => Debug.Console(1, this, "Volume={0}", _VolumeLevel);
MuteFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Debug, this, "Mute={0}", _IsMuted);
PrivacyModeIsOnFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Debug, this, "Privacy={0}", _PrivacyModeIsOn);
SharingSourceFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Debug, this, "SharingSource={0}", _SharingSource);
VolumeLevelFeedback.OutputChange += (o, a) => Debug.LogMessage(LogEventLevel.Debug, this, "Volume={0}", _VolumeLevel);
CurrentDirectoryResultIsNotDirectoryRoot = new BoolFeedback(() => DirectoryBrowseHistory.Count > 0);
@@ -140,7 +141,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// </summary>
public override void Dial(string number)
{
Debug.Console(1, this, "Dial: {0}", number);
Debug.LogMessage(LogEventLevel.Debug, this, "Dial: {0}", number);
var call = new CodecActiveCallItem() { Name = number, Number = number, Id = number, Status = eCodecCallStatus.Dialing, Direction = eCodecCallDirection.Outgoing, Type = eCodecCallType.Video };
ActiveCalls.Add(call);
OnCallStatusChange(call);
@@ -156,7 +157,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
public override void Dial(Meeting meeting)
{
Debug.Console(1, this, "Dial Meeting: {0}", meeting.Id);
Debug.LogMessage(LogEventLevel.Debug, this, "Dial Meeting: {0}", meeting.Id);
var call = new CodecActiveCallItem() { Name = meeting.Title, Number = meeting.Id, Id = meeting.Id, Status = eCodecCallStatus.Dialing, Direction = eCodecCallDirection.Outgoing, Type = eCodecCallType.Video };
ActiveCalls.Add(call);
OnCallStatusChange(call);
@@ -177,7 +178,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// </summary>
public override void EndCall(CodecActiveCallItem call)
{
Debug.Console(1, this, "EndCall");
Debug.LogMessage(LogEventLevel.Debug, this, "EndCall");
ActiveCalls.Remove(call);
SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Disconnected, call);
//ActiveCallCountFeedback.FireUpdate();
@@ -188,7 +189,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// </summary>
public override void EndAllCalls()
{
Debug.Console(1, this, "EndAllCalls");
Debug.LogMessage(LogEventLevel.Debug, this, "EndAllCalls");
for(int i = ActiveCalls.Count - 1; i >= 0; i--)
{
var call = ActiveCalls[i];
@@ -203,7 +204,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// </summary>
public override void AcceptCall(CodecActiveCallItem call)
{
Debug.Console(1, this, "AcceptCall");
Debug.LogMessage(LogEventLevel.Debug, this, "AcceptCall");
SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Connecting, call);
new CTimer(o => SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Connected, call), 1000);
// should already be in active list
@@ -214,7 +215,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// </summary>
public override void RejectCall(CodecActiveCallItem call)
{
Debug.Console(1, this, "RejectCall");
Debug.LogMessage(LogEventLevel.Debug, this, "RejectCall");
ActiveCalls.Remove(call);
SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Disconnected, call);
//ActiveCallCountFeedback.FireUpdate();
@@ -226,7 +227,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// <param name="s"></param>
public override void SendDtmf(string s)
{
Debug.Console(1, this, "SendDTMF: {0}", s);
Debug.LogMessage(LogEventLevel.Debug, this, "SendDTMF: {0}", s);
}
/// <summary>
@@ -268,7 +269,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// <param name="selector"></param>
public override void ExecuteSwitch(object selector)
{
Debug.Console(1, this, "ExecuteSwitch: {0}", selector);
Debug.LogMessage(LogEventLevel.Debug, this, "ExecuteSwitch: {0}", selector);
_SharingSource = selector.ToString();
}
@@ -330,7 +331,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// </summary>
public override void PrivacyModeOn()
{
Debug.Console(1, this, "PrivacyMuteOn");
Debug.LogMessage(LogEventLevel.Debug, this, "PrivacyMuteOn");
if (_PrivacyModeIsOn)
return;
_PrivacyModeIsOn = true;
@@ -342,7 +343,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// </summary>
public override void PrivacyModeOff()
{
Debug.Console(1, this, "PrivacyMuteOff");
Debug.LogMessage(LogEventLevel.Debug, this, "PrivacyMuteOff");
if (!_PrivacyModeIsOn)
return;
_PrivacyModeIsOn = false;
@@ -355,7 +356,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
public override void PrivacyModeToggle()
{
_PrivacyModeIsOn = !_PrivacyModeIsOn;
Debug.Console(1, this, "PrivacyMuteToggle: {0}", _PrivacyModeIsOn);
Debug.LogMessage(LogEventLevel.Debug, this, "PrivacyMuteToggle: {0}", _PrivacyModeIsOn);
PrivacyModeIsOnFeedback.FireUpdate();
}
@@ -368,7 +369,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// <param name="url"></param>
public void TestIncomingVideoCall(string url)
{
Debug.Console(1, this, "TestIncomingVideoCall from {0}", url);
Debug.LogMessage(LogEventLevel.Debug, this, "TestIncomingVideoCall from {0}", url);
var call = new CodecActiveCallItem() { Name = url, Id = url, Number = url, Type= eCodecCallType.Video, Direction = eCodecCallDirection.Incoming };
ActiveCalls.Add(call);
SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Ringing, call);
@@ -383,7 +384,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// <param name="url"></param>
public void TestIncomingAudioCall(string url)
{
Debug.Console(1, this, "TestIncomingAudioCall from {0}", url);
Debug.LogMessage(LogEventLevel.Debug, this, "TestIncomingAudioCall from {0}", url);
var call = new CodecActiveCallItem() { Name = url, Id = url, Number = url, Type = eCodecCallType.Audio, Direction = eCodecCallDirection.Incoming };
ActiveCalls.Add(call);
SetNewCallStatusAndFireCallStatusChange(eCodecCallStatus.Ringing, call);
@@ -396,7 +397,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// </summary>
public void TestFarEndHangup()
{
Debug.Console(1, this, "TestFarEndHangup");
Debug.LogMessage(LogEventLevel.Debug, this, "TestFarEndHangup");
}
@@ -676,11 +677,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
var camera = Cameras.FirstOrDefault(c => c.Key.ToLower().IndexOf(key.ToLower()) > -1);
if (camera != null)
{
Debug.Console(2, this, "Selected Camera with key: '{0}'", camera.Key);
Debug.LogMessage(LogEventLevel.Verbose, this, "Selected Camera with key: '{0}'", camera.Key);
SelectedCamera = camera;
}
else
Debug.Console(2, this, "Unable to select camera with key: '{0}'", key);
Debug.LogMessage(LogEventLevel.Verbose, this, "Unable to select camera with key: '{0}'", key);
}
#endregion
@@ -736,11 +737,11 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
{
if (SelectedCamera is IAmFarEndCamera)
{
Debug.Console(1, this, "Selecting Far End Preset: {0}", preset);
Debug.LogMessage(LogEventLevel.Debug, this, "Selecting Far End Preset: {0}", preset);
}
else
{
Debug.Console(1, this, "Selecting Near End Preset: {0}", preset);
Debug.LogMessage(LogEventLevel.Debug, this, "Selecting Near End Preset: {0}", preset);
}
}
@@ -768,7 +769,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
public void SelectFarEndPreset(int i)
{
Debug.Console(1, this, "Selecting Far End Preset: {0}", i);
Debug.LogMessage(LogEventLevel.Debug, this, "Selecting Far End Preset: {0}", i);
}
#endregion
@@ -841,7 +842,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
public override EssentialsDevice BuildDevice(DeviceConfig dc)
{
Debug.Console(1, "Factory Attempting to create new MockVC Device");
Debug.LogMessage(LogEventLevel.Debug, "Factory Attempting to create new MockVC Device");
return new VideoCodec.MockVC(dc);
}
}

49
src/PepperDash.Essentials.Devices.Common/VideoCodec/MockVC/MockVCCamera.cs
View File

@@ -7,6 +7,7 @@ using Crestron.SimplSharpPro.DeviceSupport;
using PepperDash.Core;
using PepperDash.Essentials.Core.Bridges;
using PepperDash.Essentials.Devices.Common.VideoCodec;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.Cameras
{
@@ -27,7 +28,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
public void PositionHome()
{
Debug.Console(1, this, "Resetting to home position");
Debug.LogMessage(LogEventLevel.Debug, this, "Resetting to home position");
}
#endregion
@@ -36,17 +37,17 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
public void PanLeft()
{
Debug.Console(1, this, "Panning Left");
Debug.LogMessage(LogEventLevel.Debug, this, "Panning Left");
}
public void PanRight()
{
Debug.Console(1, this, "Panning Right");
Debug.LogMessage(LogEventLevel.Debug, this, "Panning Right");
}
public void PanStop()
{
Debug.Console(1, this, "Stopping Pan");
Debug.LogMessage(LogEventLevel.Debug, this, "Stopping Pan");
}
#endregion
@@ -55,17 +56,17 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
public void TiltDown()
{
Debug.Console(1, this, "Tilting Down");
Debug.LogMessage(LogEventLevel.Debug, this, "Tilting Down");
}
public void TiltUp()
{
Debug.Console(1, this, "Tilting Up");
Debug.LogMessage(LogEventLevel.Debug, this, "Tilting Up");
}
public void TiltStop()
{
Debug.Console(1, this, "Stopping Tilt");
Debug.LogMessage(LogEventLevel.Debug, this, "Stopping Tilt");
}
#endregion
@@ -74,17 +75,17 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
public void ZoomIn()
{
Debug.Console(1, this, "Zooming In");
Debug.LogMessage(LogEventLevel.Debug, this, "Zooming In");
}
public void ZoomOut()
{
Debug.Console(1, this, "Zooming Out");
Debug.LogMessage(LogEventLevel.Debug, this, "Zooming Out");
}
public void ZoomStop()
{
Debug.Console(1, this, "Stopping Zoom");
Debug.LogMessage(LogEventLevel.Debug, this, "Stopping Zoom");
}
#endregion
@@ -93,22 +94,22 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
public void FocusNear()
{
Debug.Console(1, this, "Focusing Near");
Debug.LogMessage(LogEventLevel.Debug, this, "Focusing Near");
}
public void FocusFar()
{
Debug.Console(1, this, "Focusing Far");
Debug.LogMessage(LogEventLevel.Debug, this, "Focusing Far");
}
public void FocusStop()
{
Debug.Console(1, this, "Stopping Focus");
Debug.LogMessage(LogEventLevel.Debug, this, "Stopping Focus");
}
public void TriggerAutoFocus()
{
Debug.Console(1, this, "AutoFocus Triggered");
Debug.LogMessage(LogEventLevel.Debug, this, "AutoFocus Triggered");
}
#endregion
@@ -136,7 +137,7 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
public void PositionHome()
{
Debug.Console(1, this, "Resetting to home position");
Debug.LogMessage(LogEventLevel.Debug, this, "Resetting to home position");
}
#endregion
@@ -145,17 +146,17 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
public void PanLeft()
{
Debug.Console(1, this, "Panning Left");
Debug.LogMessage(LogEventLevel.Debug, this, "Panning Left");
}
public void PanRight()
{
Debug.Console(1, this, "Panning Right");
Debug.LogMessage(LogEventLevel.Debug, this, "Panning Right");
}
public void PanStop()
{
Debug.Console(1, this, "Stopping Pan");
Debug.LogMessage(LogEventLevel.Debug, this, "Stopping Pan");
}
#endregion
@@ -164,17 +165,17 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
public void TiltDown()
{
Debug.Console(1, this, "Tilting Down");
Debug.LogMessage(LogEventLevel.Debug, this, "Tilting Down");
}
public void TiltUp()
{
Debug.Console(1, this, "Tilting Up");
Debug.LogMessage(LogEventLevel.Debug, this, "Tilting Up");
}
public void TiltStop()
{
Debug.Console(1, this, "Stopping Tilt");
Debug.LogMessage(LogEventLevel.Debug, this, "Stopping Tilt");
}
#endregion
@@ -183,17 +184,17 @@ namespace PepperDash.Essentials.Devices.Common.Cameras
public void ZoomIn()
{
Debug.Console(1, this, "Zooming In");
Debug.LogMessage(LogEventLevel.Debug, this, "Zooming In");
}
public void ZoomOut()
{
Debug.Console(1, this, "Zooming Out");
Debug.LogMessage(LogEventLevel.Debug, this, "Zooming Out");
}
public void ZoomStop()
{
Debug.Console(1, this, "Stopping Zoom");
Debug.LogMessage(LogEventLevel.Debug, this, "Stopping Zoom");
}
#endregion

67
src/PepperDash.Essentials.Devices.Common/VideoCodec/VideoCodecBase.cs
View File

@@ -20,6 +20,7 @@ using PepperDash.Essentials.Devices.Common.Codec;
using PepperDash.Essentials.Devices.Common.VideoCodec.Interfaces;
using PepperDash.Essentials.Core.Bridges.JoinMaps;
using Feedback = PepperDash.Essentials.Core.Feedback;
using Serilog.Events;
namespace PepperDash.Essentials.Devices.Common.VideoCodec
{
@@ -259,7 +260,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
}
catch (Exception e)
{
Debug.Console(2, this, "Error in SetIsReady() : {0}", e);
Debug.LogMessage(LogEventLevel.Verbose, this, "Error in SetIsReady() : {0}", e);
}
});
}
@@ -270,14 +271,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// </summary>
public virtual void ListCalls()
{
Debug.Console(1, this, "Active Calls:");
Debug.LogMessage(LogEventLevel.Debug, this, "Active Calls:");
var sb = new StringBuilder();
foreach (var c in ActiveCalls)
{
sb.AppendFormat("id: {0} number: {1} -- name: {2} status: {3} onHold: {4}\r\n", c.Id, c.Number, c.Name, c.Status, c.IsOnHold);
}
Debug.Console(1, this, "\n{0}\n", sb.ToString());
Debug.LogMessage(LogEventLevel.Debug, this, "\n{0}\n", sb.ToString());
}
public abstract void StandbyActivate();
@@ -329,7 +330,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
/// <param name="joinMap"></param>
protected void LinkVideoCodecToApi(VideoCodecBase codec, BasicTriList trilist, VideoCodecControllerJoinMap joinMap)
{
Debug.Console(1, this, "Linking to Trilist {0}", trilist.ID.ToString("X"));
Debug.LogMessage(LogEventLevel.Debug, this, "Linking to Trilist {0}", trilist.ID.ToString("X"));
LinkVideoCodecDtmfToApi(trilist, joinMap);
@@ -697,7 +698,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
{
if (meetingIndex >= maxParticipants * offset) break;
// Debug.Console(2, this,
// Debug.LogMessage(LogEventLevel.Verbose, this,
//@"Updating Participant on xsig:
//Name: {0} (s{9})
//AudioMute: {1} (d{10})
@@ -739,7 +740,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
tokenArray[digitalIndex + 5] = new XSigDigitalToken(digitalIndex + 6, participant.HandIsRaisedFb);
tokenArray[digitalIndex + 6] = new XSigDigitalToken(digitalIndex + 7, participant.IsPinnedFb);
Debug.Console(2, this, "Index: {0} byte value: {1}", digitalIndex + 7, ComTextHelper.GetEscapedText(tokenArray[digitalIndex + 6].GetBytes()));
Debug.LogMessage(LogEventLevel.Verbose, this, "Index: {0} byte value: {1}", digitalIndex + 7, ComTextHelper.GetEscapedText(tokenArray[digitalIndex + 6].GetBytes()));
//serials
tokenArray[stringIndex] = new XSigSerialToken(stringIndex + 1, participant.Name);
@@ -778,7 +779,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
var returnString = GetXSigString(tokenArray);
//Debug.Console(2, this, "{0}", ComTextHelper.GetEscapedText(Encoding.GetEncoding(28591).GetBytes(returnString)));
//Debug.LogMessage(LogEventLevel.Verbose, this, "{0}", ComTextHelper.GetEscapedText(Encoding.GetEncoding(28591).GetBytes(returnString)));
return returnString;
@@ -811,14 +812,14 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
for (uint i = 0; i < joinMap.DialMeetingStart.JoinSpan; i++)
{
Debug.Console(1, this, "Setting action to Dial Meeting {0} to digital join {1}", i + 1, joinMap.DialMeetingStart.JoinNumber + i);
Debug.LogMessage(LogEventLevel.Debug, this, "Setting action to Dial Meeting {0} to digital join {1}", i + 1, joinMap.DialMeetingStart.JoinNumber + i);
var joinNumber = joinMap.DialMeetingStart.JoinNumber + i;
var mtg = i + 1;
var index = (int)i;
trilist.SetSigFalseAction(joinNumber, () =>
{
Debug.Console(1, this, "Meeting {0} Selected (EISC dig-o{1}) > _currentMeetings[{2}].Id: {3}, Title: {4}",
Debug.LogMessage(LogEventLevel.Debug, this, "Meeting {0} Selected (EISC dig-o{1}) > _currentMeetings[{2}].Id: {3}, Title: {4}",
mtg, joinMap.DialMeetingStart.JoinNumber + i, index, _currentMeetings[index].Id, _currentMeetings[index].Title);
if (_currentMeetings[index] != null)
Dial(_currentMeetings[index]);
@@ -931,7 +932,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
if (meetingIndex >= _meetingsToDisplay * offset)
{
Debug.Console(2, this, "Max Meetings reached");
Debug.LogMessage(LogEventLevel.Verbose, this, "Max Meetings reached");
break;
}
@@ -955,7 +956,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
while (meetingIndex < _meetingsToDisplay * offset)
{
Debug.Console(2, this, "Clearing unused data. Meeting Index: {0} MaxMeetings * Offset: {1}",
Debug.LogMessage(LogEventLevel.Verbose, this, "Clearing unused data. Meeting Index: {0} MaxMeetings * Offset: {1}",
meetingIndex, _meetingsToDisplay * offset);
//digitals
@@ -1003,7 +1004,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
{
var contactsCount = codec.DirectoryRoot.CurrentDirectoryResults.Where(c => c.ParentFolderId.Equals("root")).ToList().Count;
trilist.SetUshort(joinMap.DirectoryRowCount.JoinNumber, (ushort)contactsCount);
Debug.Console(2, this, ">>> contactsCount: {0}", contactsCount);
Debug.LogMessage(LogEventLevel.Verbose, this, ">>> contactsCount: {0}", contactsCount);
var clearBytes = XSigHelpers.ClearOutputs();
@@ -1012,7 +1013,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
var directoryXSig = UpdateDirectoryXSig(codec.DirectoryRoot,
codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue == false);
Debug.Console(2, this, "Directory XSig Length: {0}", directoryXSig.Length);
Debug.LogMessage(LogEventLevel.Verbose, this, "Directory XSig Length: {0}", directoryXSig.Length);
trilist.SetString(joinMap.DirectoryEntries.JoinNumber, directoryXSig);
}
@@ -1025,7 +1026,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
: args.Directory.CurrentDirectoryResults.Count;
trilist.SetUshort(joinMap.DirectoryRowCount.JoinNumber, (ushort)argsCount);
Debug.Console(2, this, ">>> argsCount: {0}", argsCount);
Debug.LogMessage(LogEventLevel.Verbose, this, ">>> argsCount: {0}", argsCount);
var clearBytes = XSigHelpers.ClearOutputs();
@@ -1033,7 +1034,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
Encoding.GetEncoding(XSigEncoding).GetString(clearBytes, 0, clearBytes.Length));
var directoryXSig = UpdateDirectoryXSig(args.Directory,
codec.CurrentDirectoryResultIsNotDirectoryRoot.BoolValue == false);
Debug.Console(2, this, "Directory XSig Length: {0}", directoryXSig.Length);
Debug.LogMessage(LogEventLevel.Verbose, this, "Directory XSig Length: {0}", directoryXSig.Length);
trilist.SetString(joinMap.DirectoryEntries.JoinNumber, directoryXSig);
};
@@ -1159,7 +1160,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
// Create a new token array and set the size to the number of methods times the total number of signals
var tokenArray = new XSigToken[maxMethods * offset];
Debug.Console(2, this, "Creating XSIG token array with size {0}", maxMethods * offset);
Debug.LogMessage(LogEventLevel.Verbose, this, "Creating XSIG token array with size {0}", maxMethods * offset);
// TODO: Add code to generate XSig data
foreach (var method in contact.ContactMethods)
@@ -1196,7 +1197,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
? xSigMaxIndex
: directory.CurrentDirectoryResults.Count];
Debug.Console(2, this, "IsRoot: {0}, Directory Count: {1}, TokenArray.Length: {2}", isRoot, directory.CurrentDirectoryResults.Count, tokenArray.Length);
Debug.LogMessage(LogEventLevel.Verbose, this, "IsRoot: {0}, Directory Count: {1}, TokenArray.Length: {2}", isRoot, directory.CurrentDirectoryResults.Count, tokenArray.Length);
var contacts = directory.CurrentDirectoryResults.Count > xSigMaxIndex
? directory.CurrentDirectoryResults.Take(xSigMaxIndex)
@@ -1212,7 +1213,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
var arrayIndex = counterIndex - 1;
var entryIndex = counterIndex;
Debug.Console(2, this, "Entry{2:0000} Name: {0}, Folder ID: {1}, Type: {3}, ParentFolderId: {4}",
Debug.LogMessage(LogEventLevel.Verbose, this, "Entry{2:0000} Name: {0}, Folder ID: {1}, Type: {3}, ParentFolderId: {4}",
entry.Name, entry.FolderId, entryIndex, entry.GetType().GetCType().FullName, entry.ParentFolderId);
if (entry is DirectoryFolder)
@@ -1250,7 +1251,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
if (callIndex < 0 || callIndex >= ActiveCalls.Count)
{
Debug.Console(2, this, "Cannot end call. No call found at index: {0}", callIndex);
Debug.LogMessage(LogEventLevel.Verbose, this, "Cannot end call. No call found at index: {0}", callIndex);
return;
}
@@ -1261,7 +1262,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
}
else
{
Debug.Console(0, this, "[End Call] Unable to find call at index '{0}'", i);
Debug.LogMessage(LogEventLevel.Information, this, "[End Call] Unable to find call at index '{0}'", i);
}
});
}
@@ -1272,8 +1273,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
{
trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
Debug.Console(1, this, "Call Direction: {0}", args.CallItem.Direction);
Debug.Console(1, this, "Call is incoming: {0}", args.CallItem.Direction == eCodecCallDirection.Incoming);
Debug.LogMessage(LogEventLevel.Debug, this, "Call Direction: {0}", args.CallItem.Direction);
Debug.LogMessage(LogEventLevel.Debug, this, "Call is incoming: {0}", args.CallItem.Direction == eCodecCallDirection.Incoming);
trilist.SetBool(joinMap.IncomingCall.JoinNumber, args.CallItem.Direction == eCodecCallDirection.Incoming && args.CallItem.Status == eCodecCallStatus.Ringing);
if (args.CallItem.Direction == eCodecCallDirection.Incoming)
@@ -1311,7 +1312,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
}
else
{
Debug.Console(0, this, "[Join Call] Unable to find call at index '{0}'", i);
Debug.LogMessage(LogEventLevel.Information, this, "[Join Call] Unable to find call at index '{0}'", i);
}
});
}
@@ -1343,7 +1344,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
}
else
{
Debug.Console(0, this, "[Hold Call] Unable to find call at index '{0}'", i);
Debug.LogMessage(LogEventLevel.Information, this, "[Hold Call] Unable to find call at index '{0}'", i);
}
});
@@ -1358,7 +1359,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
}
else
{
Debug.Console(0, this, "[Resume Call] Unable to find call at index '{0}'", i);
Debug.LogMessage(LogEventLevel.Information, this, "[Resume Call] Unable to find call at index '{0}'", i);
}
});
}
@@ -1371,7 +1372,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
if (!args.DeviceOnLine) return;
// TODO [ ] #983
Debug.Console(0, this, "LinkVideoCodecCallControlsToApi: device is {0}, IsInCall {1}", args.DeviceOnLine ? "online" : "offline", IsInCall);
Debug.LogMessage(LogEventLevel.Information, this, "LinkVideoCodecCallControlsToApi: device is {0}, IsInCall {1}", args.DeviceOnLine ? "online" : "offline", IsInCall);
trilist.SetBool(joinMap.HookState.JoinNumber, IsInCall);
trilist.SetString(joinMap.CurrentCallData.JoinNumber, "\xFC");
trilist.SetString(joinMap.CurrentCallData.JoinNumber, UpdateCallStatusXSig());
@@ -1480,12 +1481,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
}
else
{
Debug.Console(0, this, "Warning: No call found at index {0} or call is not active.", callIndex);
Debug.LogMessage(LogEventLevel.Information, this, "Warning: No call found at index {0} or call is not active.", callIndex);
}
}
else
{
Debug.Console(0, this, "Warning: Invalid call index specified. Please use a value of 1-8.");
Debug.LogMessage(LogEventLevel.Information, this, "Warning: Invalid call index specified. Please use a value of 1-8.");
}
}
}
@@ -1684,7 +1685,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
}
else
{
Debug.Console(0, this, "Unable to select. No camera found at index {0}", i);
Debug.LogMessage(LogEventLevel.Information, this, "Unable to select. No camera found at index {0}", i);
}
});
@@ -1787,7 +1788,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
{
if (u == 0 || u > codec.CallHistory.RecentCalls.Count)
{
Debug.Console(2, this, "Recent Call History index out of range");
Debug.LogMessage(LogEventLevel.Verbose, this, "Recent Call History index out of range");
return;
}
@@ -1974,7 +1975,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
{
PhonebookHasFolders = value;
Debug.Console(1, this, "Phonebook has folders: {0}", PhonebookHasFolders);
Debug.LogMessage(LogEventLevel.Debug, this, "Phonebook has folders: {0}", PhonebookHasFolders);
}
public void SetNumberOfContacts(int contacts)
@@ -1982,7 +1983,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
NumberOfContacts = contacts;
NumberOfContactsWasReceived = true;
Debug.Console(1, this, "Phonebook contains {0} contacts.", NumberOfContacts);
Debug.LogMessage(LogEventLevel.Debug, this, "Phonebook contains {0} contacts.", NumberOfContacts);
CheckSyncStatus();
}
@@ -2000,7 +2001,7 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec
if (InitialPhonebookFoldersWasReceived && NumberOfContactsWasReceived && PhonebookRootEntriesWasRecieved)
{
InitialSyncComplete = true;
Debug.Console(1, this, "Initial Phonebook Sync Complete!");
Debug.LogMessage(LogEventLevel.Debug, this, "Initial Phonebook Sync Complete!");
}
else
{