alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-24 01:10:22 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

wt5001: throw exception(s) on fatal errors

Browse Source 
Signed-off-by: Jon Trulson <jtrulson@ics.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Jon Trulson 2015-09-11 12:40:59 -06:00 committed by Mihai Tudor Panu
parent 1fefdcbdf1
commit 64777bd0ef
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/wt5001/wt5001.cxx
View File

@ -23,6 +23,9 @@
*/ */
#include <iostream> #include <iostream>
#include <sstream>
#include <string>
#include <stdexcept>
#include "wt5001.h" #include "wt5001.h"
@ -37,7 +40,8 @@ WT5001::WT5001(int uart)
if ( !(m_uart = mraa_uart_init(uart)) ) if ( !(m_uart = mraa_uart_init(uart)) )
{ {
cerr << __FUNCTION__ << ": mraa_uart_init() failed" << endl; throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_uart_init() failed");
return; return;
} }
@ -46,15 +50,18 @@ WT5001::WT5001(int uart)
if (!devPath) if (!devPath)
{ {
cerr << __FUNCTION__ << ": mraa_uart_get_dev_path() failed" << endl; throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_uart_get_dev_path() failed");
return; return;
} }
// now open the tty // now open the tty
if ( (m_ttyFd = open(devPath, O_RDWR)) == -1) if ( (m_ttyFd = open(devPath, O_RDWR)) == -1)
{ {
cerr << __FUNCTION__ << ": open of " << devPath << " failed: " throw std::runtime_error(std::string(__FUNCTION__) +
<< strerror(errno) << endl; ": open of " +
string(devPath) + " failed: " +
string(strerror(errno)));
return; return;
} }
} }
@ -102,7 +109,12 @@ int WT5001::readData(char *buffer, int len)
int rv = read(m_ttyFd, buffer, len); int rv = read(m_ttyFd, buffer, len);
if (rv < 0) if (rv < 0)
cerr << __FUNCTION__ << ": read failed: " << strerror(errno) << endl; {
throw std::runtime_error(std::string(__FUNCTION__) +
": read() failed: " +
string(strerror(errno)));
return rv;
}
return rv; return rv;
} }
@ -119,7 +131,9 @@ int WT5001::writeData(char *buffer, int len)
if (rv < 0) if (rv < 0)
{ {
cerr << __FUNCTION__ << ": write failed: " << strerror(errno) << endl; throw std::runtime_error(std::string(__FUNCTION__) +
": write() failed: " +
string(strerror(errno)));
return rv; return rv;
} }
@ -149,7 +163,9 @@ bool WT5001::setupTty(speed_t baud)
// make it so // make it so
if (tcsetattr(m_ttyFd, TCSAFLUSH, &termio) < 0) if (tcsetattr(m_ttyFd, TCSAFLUSH, &termio) < 0)
{ {
cerr << __FUNCTION__ << ": tcsetattr failed: " << strerror(errno) << endl; throw std::runtime_error(std::string(__FUNCTION__) +
": tcsetattr() failed: " +
string(strerror(errno)));
return false; return false;
} }
@ -267,8 +283,13 @@ bool WT5001::setVolume(uint8_t vol)
{ {
if (vol > WT5001_MAX_VOLUME) if (vol > WT5001_MAX_VOLUME)
{ {
cerr << __FUNCTION__ << ": volume must be between 0 and " // C++11 std::to_string() would be nice, but...
<< WT5001_MAX_VOLUME << endl; std::ostringstream str;
str << WT5001_MAX_VOLUME;
throw std::out_of_range(std::string(__FUNCTION__) +
": angle must be between 0 and " +
str.str());
return false; return false;
} }