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

Adds try/catch to Communication_BytesReceived callback to prevent exception from getting logged when malformed message is received

Browse Source
This commit is contained in:
Neil Dorin
2020-01-16 16:40:02 -07:00
parent 47f4d90c5a
commit 137db421ea
1 changed files with 70 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
essentials-framework/Essentials Devices Common/Essentials Devices Common/Display/SamsungMDCDisplay.cs
View File

@@ -167,84 +167,91 @@ namespace PepperDash.Essentials.Devices.Displays
/// <param name="sender"></param> /// <param name="sender"></param>
void Communication_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e) void Communication_BytesReceived(object sender, GenericCommMethodReceiveBytesArgs e)
{ {
// This is probably not thread-safe buffering try
// 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);
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));
// Need to find AA FF and have
for (int i = 0; i < newBytes.Length; i++)
{ {
if (newBytes[i] == 0xAA && newBytes[i + 1] == 0xFF) // 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);
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));
// Need to find AA FF and have
for (int i = 0; i < newBytes.Length; i++)
{ {
newBytes = newBytes.Skip(i).ToArray(); // Trim off junk if there's "dirt" in the buffer if (newBytes[i] == 0xAA && newBytes[i + 1] == 0xFF)
// parse it
// If it's at least got the header, then process it,
while (newBytes.Length > 4 && newBytes[0] == 0xAA && newBytes[1] == 0xFF)
{ {
var msgLen = newBytes[3]; newBytes = newBytes.Skip(i).ToArray(); // Trim off junk if there's "dirt" in the buffer
// if the buffer is shorter than the header (3) + message (msgLen) + checksum (1),
// give and save it for next time
if (newBytes.Length < msgLen + 4)
break;
// Good length, grab the message // parse it
var message = newBytes.Skip(4).Take(msgLen).ToArray(); // If it's at least got the header, then process it,
while (newBytes.Length > 4 && newBytes[0] == 0xAA && newBytes[1] == 0xFF)
// At this point, the ack/nak is the first byte
if (message[0] == 0x41)
{ {
switch (message[1]) // type byte var msgLen = newBytes[3];
// if the buffer is shorter than the header (3) + message (msgLen) + checksum (1),
// give and save it for next time
if (newBytes.Length < msgLen + 4)
break;
// Good length, grab the message
var message = newBytes.Skip(4).Take(msgLen).ToArray();
// At this point, the ack/nak is the first byte
if (message[0] == 0x41)
{ {
case 0x00: // General status switch (message[1]) // type byte
//UpdatePowerFB(message[2], message[5]); // "power" can be misrepresented when the display sleeps {
case 0x00: // General status
//UpdatePowerFB(message[2], message[5]); // "power" can be misrepresented when the display sleeps
// Handle the first power on fb when waiting for it. // Handle the first power on fb when waiting for it.
if (IsPoweringOnIgnorePowerFb && message[2] == 0x01) if (IsPoweringOnIgnorePowerFb && message[2] == 0x01)
IsPoweringOnIgnorePowerFb = false; IsPoweringOnIgnorePowerFb = false;
// Ignore general-status power off messages when powering up // Ignore general-status power off messages when powering up
if (!(IsPoweringOnIgnorePowerFb && message[2] == 0x00)) if (!(IsPoweringOnIgnorePowerFb && message[2] == 0x00))
UpdatePowerFB(message[2]); UpdatePowerFB(message[2]);
UpdateVolumeFB(message[3]); UpdateVolumeFB(message[3]);
UpdateMuteFb(message[4]); UpdateMuteFb(message[4]);
UpdateInputFb(message[5]); UpdateInputFb(message[5]);
break; break;
case 0x11: case 0x11:
UpdatePowerFB(message[2]); UpdatePowerFB(message[2]);
break; break;
case 0x12: case 0x12:
UpdateVolumeFB(message[2]); UpdateVolumeFB(message[2]);
break; break;
case 0x13: case 0x13:
UpdateMuteFb(message[2]); UpdateMuteFb(message[2]);
break; break;
case 0x14: case 0x14:
UpdateInputFb(message[2]); UpdateInputFb(message[2]);
break; break;
default: default:
break; break;
}
} }
// Skip over what we've used and save the rest for next time
newBytes = newBytes.Skip(5 + msgLen).ToArray();
} }
// Skip over what we've used and save the rest for next time
newBytes = newBytes.Skip(5 + msgLen).ToArray(); break; // parsing will mean we can stop looking for header in loop
} }
break; // parsing will mean we can stop looking for header in loop
} }
}
// Save whatever partial message is here // Save whatever partial message is here
IncomingBuffer = newBytes; IncomingBuffer = newBytes;
}
catch (Exception err)
{
Debug.Console(2, this, "Error parsing feedback: {0}", err);
}
} }
/// <summary> /// <summary>