compAIR/libcreate
compAIR/libcreate
4
0
Fork 1
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix bug: Too many packets requested corrupting serial buffer

Browse source
This commit is contained in:
jacobperron 2016-02-13 11:50:39 -08:00
parent 9cb3250268
commit fc1fb48930
3 changed files with 60 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/serial.cpp
View file

@ -130,6 +130,24 @@ namespace create {
}
}
void Serial::notifyDataReady() {
// Validate all packets
data->validateAll();
// Notify first data packets ready
{
boost::lock_guard<boost::mutex> lock(dataReadyMut);
if (!dataReady) {
dataReady = true;
dataReadyCond.notify_one();
}
}
// Callback to notify data is ready
if (callback)
callback();
}
void Serial::onData(const boost::system::error_code& e, const std::size_t& size) {
if (e) {
CERR("[create::Serial] ", "serial error - " << e.message());
@ -153,8 +171,10 @@ namespace create {
readState = READ_PACKET_ID;
numBytesRead = 0;
}
else
else {
//notifyDataReady();
readState = READ_HEADER;
}
break;
case READ_PACKET_ID:
@ -167,6 +187,7 @@ namespace create {
readState = READ_PACKET_BYTES;
}
else {
//notifyDataReady();
readState = READ_HEADER;
}
break;
@ -192,20 +213,7 @@ namespace create {
case READ_CHECKSUM:
if ((byteSum & 0xFF) == 0) {
// Validate all packets
data->validateAll();
// Notify first data packets ready
{
boost::lock_guard<boost::mutex> lock(dataReadyMut);
if (!dataReady) {
dataReady = true;
dataReadyCond.notify_one();
}
}
// Callback to notify data is ready
if (callback)
callback();
notifyDataReady();
}
else {
// Corrupt data