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

APDS9930: Add string based constructor for Digital Proximity and Ambient Light Sensor

Browse Source 
Signed-off-by: Adelin Dobre <adelin.dobre@rinftech.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Adelin Dobre 2018-07-11 17:36:25 +03:00 committed by Mihai Tudor Panu
parent cca6a86268
commit 93196d62cb
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/apds9930/apds9930.cxx
View File

@ -27,6 +27,7 @@
#include <stdexcept>
#include "apds9930.hpp"
#include "upm_string_parser.hpp"
using namespace upm;
@ -39,6 +40,44 @@ APDS9930::APDS9930(int device)
}
}
APDS9930::APDS9930(std::string initStr) : mraaIo(initStr)
{
mraa_io_descriptor* descs = mraaIo.getMraaDescriptors();
if(!descs->iios)
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_iio_init() failed");
}
else
{
if(!(m_iio = descs->iios[0]))
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_iio_init() failed");
}
}
std::vector<std::string> upmTokens;
if (!mraaIo.getLeftoverStr().empty()) {
upmTokens = UpmStringParser::parse(mraaIo.getLeftoverStr());
}
for (std::string tok : upmTokens) {
if(tok.substr(0,16) == "enableProximity:") {
bool enable = std::stoi(tok.substr(16),nullptr,0);
enableProximity(enable);
}
if(tok.substr(0,18) == "enableIlluminance:") {
bool enable = std::stoi(tok.substr(18),nullptr,0);
enableIlluminance(enable);
}
}
}
APDS9930::~APDS9930()
{
if (m_iio)
@ -81,4 +120,4 @@ APDS9930::enableIlluminance(bool enable)
mraa_iio_write_int(m_iio, "in_illuminance_en", 0);
return true;
}
}

8
src/apds9930/apds9930.hpp
View File

@ -25,6 +25,7 @@
#include <string>
#include <mraa/iio.h>
#include <mraa/initio.hpp>
namespace upm
{
@ -60,6 +61,12 @@ class APDS9930
* @param device iio device number
*/
APDS9930(int device);
/**
* Instantiates APDS9930 Digital Proximity and Ambient Light Sensor based on a given string.
*
* @param initStr string containing specific information for APDS9930 initialization.
*/
APDS9930(std::string initStr);
/**
* APDS9930 destructor
*/
@ -89,5 +96,6 @@ class APDS9930
private:
mraa_iio_context m_iio;
mraa::MraaIo mraaIo;
};
}