alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

APDS-9002: Add string based constructor for Luminance Sensor

Browse Source 
Signed-off-by: Adelin Dobre <adelin.dobre@rinftech.com>
This commit is contained in:
Adelin Dobre 2018-07-11 17:06:39 +03:00 committed by Stefan Andritoiu
parent 7265373a47
commit dad2e1f81a
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/apds9002/apds9002.cxx
View File

@ -27,12 +27,13 @@
#include <stdexcept> #include <stdexcept>
#include "apds9002.hpp" #include "apds9002.hpp"
#include "upm_string_parser.hpp"
using namespace upm; using namespace upm;
APDS9002::APDS9002(int pin) APDS9002::APDS9002(int pin)
{ {
if ( !(m_aio = mraa_aio_init(pin)) ) if ( !(m_aio = mraa_aio_init(pin)) )
{ {
throw std::invalid_argument(std::string(__FUNCTION__) + throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init() failed, invalid pin?"); ": mraa_aio_init() failed, invalid pin?");
@ -40,6 +41,26 @@ APDS9002::APDS9002(int pin)
} }
} }
APDS9002::APDS9002(std::string initStr) : mraaIo(initStr)
{
mraa_io_descriptor* descs = mraaIo.getMraaDescriptors();
if(!descs->aios)
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init() failed, invalid pin?");
}
else
{
if( !(m_aio = descs->aios[0]) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init() failed, invalid pin?");
}
}
}
APDS9002::~APDS9002() APDS9002::~APDS9002()
{ {
mraa_aio_close(m_aio); mraa_aio_close(m_aio);

8
src/apds9002/apds9002.hpp
View File

@ -25,6 +25,7 @@
#include <string> #include <string>
#include <mraa/aio.h> #include <mraa/aio.h>
#include <mraa/initio.hpp>
namespace upm { namespace upm {
/** /**
@ -60,6 +61,12 @@ namespace upm {
* @param pin Analog pin to use * @param pin Analog pin to use
*/ */
APDS9002(int pin); APDS9002(int pin);
/**
* Instantiates APDS-9002 Luminance Sensor based on a given string.
*
* @param initStr string containing specific information for APDS-9002 initialization.
*/
APDS9002(std::string initStr);
/** /**
* APDS9002 destructor * APDS9002 destructor
*/ */
@ -73,6 +80,7 @@ namespace upm {
private: private:
mraa_aio_context m_aio; mraa_aio_context m_aio;
mraa::MraaIo mraaIo;
}; };
} }