pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 12:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(essentials): Adds some better console log comments and calls SetUpCameras() after reading data from codec.

Browse Source
This commit is contained in:
Neil Dorin
2022-02-09 14:48:45 -07:00
parent adbce916ba
commit 90023621dc
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
essentials-framework/Essentials Devices Common/Essentials Devices Common/VideoCodec/CiscoCodec/CiscoSparkCodec.cs
View File

@@ -649,10 +649,12 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
// Check for camera config info first // Check for camera config info first
if (_config.CameraInfo.Count > 0) if (_config.CameraInfo.Count > 0)
{ {
Debug.Console(0, this, "Reading codec cameraInfo from config properties.");
SetUpCameras(_config.CameraInfo); SetUpCameras(_config.CameraInfo);
} }
else else
{ {
Debug.Console(0, this, "No cameraInfo defined in video codec config. Attempting to get camera info from codec status data");
try try
{ {
var cameraInfo = new List<CameraInfo>(); var cameraInfo = new List<CameraInfo>();
@@ -663,6 +665,10 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
var info = new CameraInfo() { CameraNumber = id, Name = string.Format("{0} {1}", camera.Manufacturer, camera.Model), SourceId = camera.DetectedConnector.ConnectorId }; var info = new CameraInfo() { CameraNumber = id, Name = string.Format("{0} {1}", camera.Manufacturer, camera.Model), SourceId = camera.DetectedConnector.ConnectorId };
cameraInfo.Add(info); cameraInfo.Add(info);
} }
Debug.Console(0, this, "Successfully got cameraInfo for {0} cameras from codec.", cameraInfo.Count);
SetUpCameras(cameraInfo);
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -670,10 +676,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
} }
} }
// Fire the ready event
SetIsReady();
//CommDebuggingIsOn = false; //CommDebuggingIsOn = false;
GetCallHistory(); GetCallHistory();
@@ -683,6 +685,9 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
BookingsRefreshTimer = new CTimer(GetBookings, 900000, 900000); // 15 minute timer to check for new booking info BookingsRefreshTimer = new CTimer(GetBookings, 900000, 900000); // 15 minute timer to check for new booking info
GetBookings(null); GetBookings(null);
// Fire the ready event
SetIsReady();
} }
public void SetCommDebug(string s) public void SetCommDebug(string s)
@@ -2003,6 +2008,8 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
SelectedCameraFeedback = new StringFeedback(() => SelectedCamera.Key); SelectedCameraFeedback = new StringFeedback(() => SelectedCamera.Key);
SelectedCamera = Cameras[0]; ; // call the method to select the camera and ensure the feedbacks get updated.
ControllingFarEndCameraFeedback = new BoolFeedback(() => SelectedCamera is IAmFarEndCamera); ControllingFarEndCameraFeedback = new BoolFeedback(() => SelectedCamera is IAmFarEndCamera);
DeviceManager.AddDevice(farEndCamera); DeviceManager.AddDevice(farEndCamera);
@@ -2018,7 +2025,6 @@ namespace PepperDash.Essentials.Devices.Common.VideoCodec.Cisco
FarEndRoomPresets.Add(new CodecRoomPreset(i, label, true, false)); FarEndRoomPresets.Add(new CodecRoomPreset(i, label, true, false));
} }
SelectedCamera = Cameras[0]; ; // call the method to select the camera and ensure the feedbacks get updated.
} }
#region IHasCodecCameras Members #region IHasCodecCameras Members