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

Last merge undid some of the changes for windows compatability.

Browse Source
This commit is contained in:
John Harrison 2011-03-24 10:21:03 -05:00
parent 619fd31dd4
commit bf5fd97c56
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/serial.cpp
View File

@ -159,8 +159,6 @@ void Serial::init() {
Serial::~Serial() {
this->close();
if(this->timeout != NULL)
delete this->timeout;
}
void Serial::open() {
@ -190,7 +188,7 @@ void Serial::close() {
if(this->serial_port != NULL) {
this->serial_port->cancel();
this->serial_port->close();
delete this->serial_port;
this->serial_port.reset();
}
}
@ -331,13 +329,13 @@ const bytesize_t Serial::getBytesize() const {
void Serial::setParity(parity_t parity) {
switch(parity) {
case PARITY_NONE:
case NONE:
this->parity = boost::asio::serial_port_base::parity(boost::asio::serial_port_base::parity::none);
break;
case PARITY_ODD:
case ODD:
this->parity = boost::asio::serial_port_base::parity(boost::asio::serial_port_base::parity::odd);
break;
case PARITY_EVEN:
case EVEN:
this->parity = boost::asio::serial_port_base::parity(boost::asio::serial_port_base::parity::even);
break;
default:
@ -349,11 +347,11 @@ void Serial::setParity(parity_t parity) {
const parity_t Serial::getParity() const {
switch(this->parity.value()) {
case boost::asio::serial_port_base::parity::none:
return parity_t(PARITY_NONE);
return parity_t(NONE);
case boost::asio::serial_port_base::parity::odd:
return parity_t(PARITY_ODD);
return parity_t(ODD);
case boost::asio::serial_port_base::parity::even:
return parity_t(PARITY_EVEN);
return parity_t(EVEN);
default:
throw(InvalidParityException(this->parity.value()));
}