diff --git a/Essentials Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs b/Essentials Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs index 49c39fc0..af096898 100644 --- a/Essentials Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs +++ b/Essentials Core/PepperDashEssentialsBase/Devices/DeviceJsonApi.cs @@ -235,12 +235,23 @@ namespace PepperDash.Essentials.Core public PropertyInfo PropInfo { get; private set; } public string Name { get { return PropInfo.Name; } } public string Type { get { return PropInfo.PropertyType.Name; } } - public string Value { get { + public string Value { get + { if (PropInfo.CanRead) - return PropInfo.GetValue(Parent, null).ToString(); + { + try + { + return PropInfo.GetValue(Parent, null).ToString(); + } + catch (Exception) + { + return null; + } + } else - return "-"; + return null; } } + public bool CanRead { get { return PropInfo.CanRead; } } public bool CanWrite { get { return PropInfo.CanWrite; } } diff --git a/Essentials Core/PepperDashEssentialsBase/Monitoring/GenericCommunicationMonitor.cs b/Essentials Core/PepperDashEssentialsBase/Monitoring/GenericCommunicationMonitor.cs index 1901f7c5..bf5bc25b 100644 --- a/Essentials Core/PepperDashEssentialsBase/Monitoring/GenericCommunicationMonitor.cs +++ b/Essentials Core/PepperDashEssentialsBase/Monitoring/GenericCommunicationMonitor.cs @@ -104,7 +104,7 @@ namespace PepperDash.Essentials.Core void Client_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e) { Status = MonitorStatus.IsOk; - StopErrorTimers(); + ResetErrorTimers(); } void Poll() diff --git a/Essentials Core/PepperDashEssentialsBase/Monitoring/StatusMonitorBase.cs b/Essentials Core/PepperDashEssentialsBase/Monitoring/StatusMonitorBase.cs index 685a0c43..defcf07a 100644 --- a/Essentials Core/PepperDashEssentialsBase/Monitoring/StatusMonitorBase.cs +++ b/Essentials Core/PepperDashEssentialsBase/Monitoring/StatusMonitorBase.cs @@ -102,17 +102,12 @@ namespace PepperDash.Essentials.Core ErrorTimer = null; } - public void ResetErrorTimers() + protected void ResetErrorTimers() { if(WarningTimer != null) WarningTimer.Reset(WarningTime, WarningTime); if(ErrorTimer != null) ErrorTimer.Reset(ErrorTime, ErrorTime); } - - public void PrintStatus() - { - CrestronConsole.PrintLine("Status={0}", Status); - } } } \ No newline at end of file diff --git a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo index aa620590..c84c8344 100644 Binary files a/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo and b/Essentials Core/PepperDashEssentialsBase/PepperDash_Essentials_Core.projectinfo differ diff --git a/Essentials DM/Essentials_DM/Essentials_DM.projectinfo b/Essentials DM/Essentials_DM/Essentials_DM.projectinfo index 6848de7f..f4eaad63 100644 Binary files a/Essentials DM/Essentials_DM/Essentials_DM.projectinfo and b/Essentials DM/Essentials_DM/Essentials_DM.projectinfo differ diff --git a/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs b/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs index 90af7af1..8f7831b3 100644 --- a/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs +++ b/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs @@ -153,13 +153,13 @@ namespace PepperDash.Essentials.Devices.Displays /// void Communication_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e) { - Debug.Console(2, this, "Socket in: {0}", ComTextHelper.GetEscapedText(e.Bytes)); + //Debug.Console(2, this, "Socket in: {0}", ComTextHelper.GetEscapedText(e.Bytes)); // This is probably not thread-safe buffering // Append the incoming bytes with whatever is in the buffer var newBytes = new byte[IncomingBuffer.Length + e.Bytes.Length]; IncomingBuffer.CopyTo(newBytes, 0); e.Bytes.CopyTo(newBytes, IncomingBuffer.Length); - Debug.Console(2, this, "Buffer+new: {0}", ComTextHelper.GetEscapedText(newBytes)); + //Debug.Console(2, this, "Buffer+new: {0}", ComTextHelper.GetEscapedText(newBytes)); // Need to find AA FF and have for (int i = 0; i < newBytes.Length; i++) @@ -180,7 +180,7 @@ namespace PepperDash.Essentials.Devices.Displays // Good length, grab the message var message = newBytes.Skip(4).Take(msgLen).ToArray(); - Debug.Console(0, this, "Parsing: {0}", ComTextHelper.GetEscapedText(message)); + Debug.Console(0, this, "Parsing input: {0}", ComTextHelper.GetEscapedText(message)); // At this point, the ack/nak is the first byte if (message[0] == 0x41) @@ -292,7 +292,6 @@ namespace PepperDash.Essentials.Devices.Displays b[b.Length - 1] = (byte)checksum; 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)); - CommunicationMonitor.ResetErrorTimers(); // Helps prevent message collisions Communication.SendBytes(b); } diff --git a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo index e2e60102..e65b9946 100644 Binary files a/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo and b/Essentials Devices Common/Essentials Devices Common/Essentials Devices Common.projectinfo differ diff --git a/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs b/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs index 03f41cb3..1b794f77 100644 --- a/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs +++ b/Essentials/PepperDashEssentials/Fusion/FusionSystemController.cs @@ -26,9 +26,9 @@ namespace PepperDash.Essentials.Fusion { public class EssentialsHuddleSpaceFusionSystemController : Device { - public event EventHandler ScheduleChange; - public event EventHandler MeetingEndWarning; - public event EventHandler NextMeetingBeginWarning; + //public event EventHandler ScheduleChange; + //public event EventHandler MeetingEndWarning; + //public event EventHandler NextMeetingBeginWarning; FusionRoom FusionRoom; EssentialsHuddleSpaceRoom Room; diff --git a/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo b/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo index 30ce6412..754aad41 100644 Binary files a/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo and b/Essentials/PepperDashEssentials/PepperDashEssentials.projectinfo differ diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz index 915cfb00..96769c69 100644 Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll index 007d3282..e45fafca 100644 Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ