Myth/serial
1
0
Fork 0
mirror of https://github.com/wjwwood/serial.git synced 2026-01-23 04:04:54 +08:00
Code Issues Projects Releases Wiki Activity

Adding a read_until option where you can insert a deliminator.

Browse Source
This commit is contained in:
John Harrison 2011-04-01 13:53:01 -05:00
parent 5ef78ddefd
commit a6922147d7
2 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/serial.h
View File

@ -175,6 +175,9 @@ public:
*/
const std::string read(int size = 1);
std::string read_until(char delim, size_t size = -1);
std::string read_until(std::string delim, size_t size = -1);
/** Write length bytes from buffer to the serial port.
*
* @param data A char[] with data to be written to the serial port.

58
src/serial.cpp
View File

@ -239,6 +239,64 @@ const std::string Serial::read(int size) {
return return_str;
}
std::string
Serial::read_until(char delim, size_t size) {
this->reading = true;
boost::asio::streambuf b(size == -1 ? size : (std::numeric_limits< std::size_t >::max)());
boost::asio::async_read_until(*this->serial_port, b, delim,
boost::bind(&Serial::read_complete, this,
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred));
if(this->timeout > timeout_zero_comparison) { // Only set a timeout_timer if there is a valid timeout
this->timeout_timer.expires_from_now(this->timeout);
this->timeout_timer.async_wait(boost::bind(&Serial::timeout_callback, this,
boost::asio::placeholders::error));
} else if(this->nonblocking) {
this->timeout_timer.expires_from_now(boost::posix_time::milliseconds(1));
this->timeout_timer.async_wait(boost::bind(&Serial::timeout_callback, this,
boost::asio::placeholders::error));
}
while(this->reading)
this->io_service.run_one();
b.commit(bytes_read);
std::istream is(&b);
std::string s;
is >> s;
return s;
}
std::string
Serial::read_until(std::string delim, size_t size) {
this->reading = true;
boost::asio::streambuf b(size == -1 ? size : (std::numeric_limits< std::size_t >::max)());
boost::asio::async_read_until(*this->serial_port, b, delim,
boost::bind(&Serial::read_complete, this,
boost::asio::placeholders::error,
boost::asio::placeholders::bytes_transferred));
if(this->timeout > timeout_zero_comparison) { // Only set a timeout_timer if there is a valid timeout
this->timeout_timer.expires_from_now(this->timeout);
this->timeout_timer.async_wait(boost::bind(&Serial::timeout_callback, this,
boost::asio::placeholders::error));
} else if(this->nonblocking) {
this->timeout_timer.expires_from_now(boost::posix_time::milliseconds(1));
this->timeout_timer.async_wait(boost::bind(&Serial::timeout_callback, this,
boost::asio::placeholders::error));
}
while(this->reading)
this->io_service.run_one();
b.commit(bytes_read);
std::istream is(&b);
std::string s;
is >> s;
return s;
}
void Serial::read_complete(const boost::system::error_code& error, std::size_t bytes_transferred) {
if(!error || error != boost::asio::error::operation_aborted) { // If there was no error OR the error wasn't operation aborted (canceled), Cancel the timer
this->timeout_timer.cancel(); // will cause timeout_callback to fire with an error