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

mhz16: 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-10 15:46:57 -06:00 committed by Mihai Tudor Panu
parent 0db47c7528
commit 14fc909400
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/mhz16/mhz16.cxx
View File

@ -23,6 +23,8 @@
*/ */
#include <iostream> #include <iostream>
#include <string>
#include <stdexcept>
#include "mhz16.h" #include "mhz16.h"
@ -37,7 +39,8 @@ MHZ16::MHZ16(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 +49,18 @@ MHZ16::MHZ16(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 +108,12 @@ int MHZ16::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 +130,9 @@ int MHZ16::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 +162,9 @@ bool MHZ16::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;
} }
@ -160,7 +175,8 @@ bool MHZ16::verifyPacket(uint8_t *pkt, int len)
{ {
if (pkt[0] != 0xff || pkt[1] != 0x86) if (pkt[0] != 0xff || pkt[1] != 0x86)
{ {
cerr << __FUNCTION__ << ": Inavlid packet header." << endl; throw std::runtime_error(std::string(__FUNCTION__) +
": invalid packet header received");
return false; return false;
} }
@ -178,7 +194,8 @@ bool MHZ16::getData(int *gas, int *temp)
// wait up to one second for a response // wait up to one second for a response
if (!dataAvailable(1000)) if (!dataAvailable(1000))
{ {
cerr << __FUNCTION__ << ": Timed out waiting for response." << endl; throw std::runtime_error(std::string(__FUNCTION__) +
": Timed out waiting for response");
return false; return false;
} }
@ -188,16 +205,13 @@ bool MHZ16::getData(int *gas, int *temp)
if ((rv = readData((char *)packet, 9)) != 9) if ((rv = readData((char *)packet, 9)) != 9)
{ {
cerr << __FUNCTION__ << ": Invalid packet read, rv = " << rv throw std::runtime_error(std::string(__FUNCTION__) +
<< ", expected 9." << endl; ": Invalid packet size read");
return false; return false;
} }
if (!verifyPacket(packet, 9)) // will throw an exception if it fails
{ verifyPacket(packet);
cerr << __FUNCTION__ << ": Packet verify failed." << endl;
return false;
}
// pull out the data and return it. // pull out the data and return it.
*gas = (packet[2] << 8) | packet[3]; *gas = (packet[2] << 8) | packet[3];