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

PARTY_* related fixes. Compiles and works on OS X and Windows, needs to be tested on Linux.

Browse Source
This commit is contained in:
William Woodall 2011-03-24 10:59:56 -05:00
parent 72882a07a3
commit 30ae4847ab
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/serial.h
View File

@ -70,7 +70,7 @@
#define DEFAULT_BYTESIZE EIGHTBITS #define DEFAULT_BYTESIZE EIGHTBITS
#endif #endif
#ifndef DEFAULT_PARITY #ifndef DEFAULT_PARITY
#define DEFAULT_PARITY NONE #define DEFAULT_PARITY PARTIY_NONE
#endif #endif
#ifndef DEFAULT_STOPBITS #ifndef DEFAULT_STOPBITS
#define DEFAULT_STOPBITS STOPBITS_ONE #define DEFAULT_STOPBITS STOPBITS_ONE

12
src/serial.cpp
View File

@ -329,13 +329,13 @@ const bytesize_t Serial::getBytesize() const {
void Serial::setParity(parity_t parity) { void Serial::setParity(parity_t parity) {
switch(parity) { switch(parity) {
case NONE: case PARITY_NONE:
this->parity = boost::asio::serial_port_base::parity(boost::asio::serial_port_base::parity::none); this->parity = boost::asio::serial_port_base::parity(boost::asio::serial_port_base::parity::none);
break; break;
case ODD: case PARITY_ODD:
this->parity = boost::asio::serial_port_base::parity(boost::asio::serial_port_base::parity::odd); this->parity = boost::asio::serial_port_base::parity(boost::asio::serial_port_base::parity::odd);
break; break;
case EVEN: case PARITY_EVEN:
this->parity = boost::asio::serial_port_base::parity(boost::asio::serial_port_base::parity::even); this->parity = boost::asio::serial_port_base::parity(boost::asio::serial_port_base::parity::even);
break; break;
default: default:
@ -347,11 +347,11 @@ void Serial::setParity(parity_t parity) {
const parity_t Serial::getParity() const { const parity_t Serial::getParity() const {
switch(this->parity.value()) { switch(this->parity.value()) {
case boost::asio::serial_port_base::parity::none: case boost::asio::serial_port_base::parity::none:
return parity_t(NONE); return parity_t(PARITY_NONE);
case boost::asio::serial_port_base::parity::odd: case boost::asio::serial_port_base::parity::odd:
return parity_t(ODD); return parity_t(PARITY_ODD);
case boost::asio::serial_port_base::parity::even: case boost::asio::serial_port_base::parity::even:
return parity_t(EVEN); return parity_t(PARITY_EVEN);
default: default:
throw(InvalidParityException(this->parity.value())); throw(InvalidParityException(this->parity.value()));
} }