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

AD8232: Make some changes in cpp interface

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-10-31 12:57:16 +02:00 committed by Mihai Tudor Panu
parent 660b34c2ce
commit 1111a830c9
2 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/ad8232/ad8232.cxx
View File

@ -31,74 +31,60 @@
using namespace upm; using namespace upm;
using namespace std; using namespace std;
static bool operator!(mraa::MraaIo &mraaIo)
AD8232::AD8232(int loPlus, int loMinus, int output, float aref) :
m_gpioLOPlus(loPlus), m_gpioLOMinus(loMinus), m_aioOUT(output)
{ {
return mraaIo.getMraaDescriptors() == NULL; m_gpioLOPlus.dir(mraa::DIR_IN);
} m_gpioLOMinus.dir(mraa::DIR_IN);
AD8232::AD8232(int loPlus, int loMinus, int output, float aref) {
m_gpioLOPlus = new mraa::Gpio(loPlus);
m_gpioLOMinus = new mraa::Gpio(loMinus);
m_aioOUT = new mraa::Aio(output);
m_gpioLOPlus->dir(mraa::DIR_IN);
m_gpioLOMinus->dir(mraa::DIR_IN);
m_aref = aref; m_aref = aref;
m_ares = (1 << m_aioOUT->getBit()); m_ares = (1 << m_aioOUT.getBit());
} }
AD8232::AD8232(std::string initStr) : mraaIo(initStr) { AD8232::AD8232(std::string initStr) :
if(!mraaIo.gpios.empty()) { m_gpioLOPlus(nullptr), m_gpioLOMinus(nullptr), m_aioOUT(nullptr), mraaIo(initStr) {
if(mraaIo.gpios.size() == 2) {
m_gpioLOPlus = &mraaIo.gpios[0]; mraa_io_descriptor* descs = mraaIo.getMraaDescriptors();
m_gpioLOMinus = &mraaIo.gpios[1];
}
else {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init() must initialize two pins");
}
}
else {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init() failed, invalid pin?");
}
if(!mraaIo.aios.empty()) {
m_aioOUT = &mraaIo.aios[0];
}
else {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init() failed, invalid pin?");
}
std::vector<std::string> upmTokens; std::vector<std::string> upmTokens;
if(!mraaIo.getLeftoverStr().empty()) { if(!mraaIo.getLeftoverStr().empty()) {
upmTokens = UpmStringParser::parse(mraaIo.getLeftoverStr()); upmTokens = UpmStringParser::parse(mraaIo.getLeftoverStr());
} }
if(!descs->gpios) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init() must initialize two pins");
} else {
if(descs->gpios[0])
m_gpioLOPlus = descs->gpios[0];
if(descs->gpios[1])
m_gpioLOMinus = descs->gpios[1];
}
if(!descs->aios){
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init() failed, invalid pin?");
} else {
m_aioOUT = descs->aios[0];
}
for (std::string tok : upmTokens) { for (std::string tok : upmTokens) {
if(tok.substr(0, 5) == "volt:") { if(tok.substr(0, 5) == "aref:") {
m_aref = std::stof(tok.substr(5)); m_aref = std::stof(tok.substr(5));
} }
} }
m_ares = (1 << m_aioOUT->getBit()); m_ares = (1 << m_aioOUT.getBit());
} }
AD8232::~AD8232() AD8232::~AD8232()
{ {
if(!mraaIo) {
delete m_gpioLOPlus;
delete m_gpioLOMinus;
delete m_aioOUT;
}
} }
int AD8232::value() int AD8232::value()
{ {
if (m_gpioLOPlus->read() || m_gpioLOMinus->read()) if (m_gpioLOPlus.read() || m_gpioLOMinus.read())
return 0; return 0;
else else
return m_aioOUT->read(); return m_aioOUT.read();
} }

6
src/ad8232/ad8232.hpp
View File

@ -105,10 +105,10 @@ namespace upm {
int value(); int value();
private: private:
mraa::Gpio m_gpioLOPlus;
mraa::Gpio m_gpioLOMinus;
mraa::Aio m_aioOUT;
mraa::MraaIo mraaIo; mraa::MraaIo mraaIo;
mraa::Gpio *m_gpioLOPlus = NULL;
mraa::Gpio *m_gpioLOMinus = NULL;
mraa::Aio *m_aioOUT = NULL;
float m_aref; float m_aref;
int m_ares; int m_ares;