otp538u: throw exception(s) on fatal errors.

In addition, throw out_of_range() exceptions in
object/ambientTemperature() methods when they occur instead of just
returning 0, which is a valid temperature return value.

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-08 13:08:05 -06:00 committed by Mihai Tudor Panu
parent a2855c5e72
commit b4e4e9ae89

View File

@ -23,6 +23,8 @@
*/
#include <iostream>
#include <string>
#include <stdexcept>
#include "otp538u.h"
@ -55,7 +57,8 @@ OTP538U::OTP538U(int pinA, int pinO, float aref)
if ( !(m_aioA = mraa_aio_init(pinA)) )
{
cerr << __FUNCTION__ << ": mraa_aio_init() failed" << endl;
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(pinA) failed, invalid pin?");
return;
}
@ -64,7 +67,8 @@ OTP538U::OTP538U(int pinA, int pinO, float aref)
if ( !(m_aioO = mraa_aio_init(pinO)) )
{
cerr << __FUNCTION__ << ": mraa_aio_init() failed" << endl;
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(pinO) failed, invalid pin?");
return;
}
@ -109,8 +113,9 @@ float OTP538U::ambientTemperature()
}
if (j >= otp538u_rt_table_max)
{
cerr << __FUNCTION__ << ": ambient temperature out of range." << endl;
{
throw std::out_of_range(std::string(__FUNCTION__) +
": ambient temperature out of range.");
return 0;
}
@ -123,7 +128,8 @@ float OTP538U::ambientTemperature()
// too cold
if (slot < 0)
{
cerr << __FUNCTION__ << ": ambient temperature out of range." << endl;
throw std::out_of_range(std::string(__FUNCTION__) +
": ambient temperature out of range.");
return 0;
}
@ -174,7 +180,8 @@ float OTP538U::objectTemperature()
if (slot >= (otp538u_vt_table_max - 1))
{
cerr << __FUNCTION__ << ": object temperature out of range." << endl;
throw std::out_of_range(std::string(__FUNCTION__) +
": object temperature out of range.");
return 0;
}