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: Fix some issues in sensor constructor

Browse Source 
Signed-off-by: Adelin Dobre <adelin.dobre1994@gmail.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Adelin Dobre 2018-07-05 16:24:24 +03:00 committed by Mihai Tudor Panu
parent db3b99a792
commit 82edcec766
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/ad8232/ad8232.cxx
View File

@ -25,6 +25,7 @@
#include <iostream> #include <iostream>
#include "upm_string_parser.hpp" #include "upm_string_parser.hpp"
#include "ad8232.hpp" #include "ad8232.hpp"
#include <typeinfo>
using namespace upm; using namespace upm;
using namespace std; using namespace std;
@ -39,14 +40,22 @@ AD8232::AD8232(int loPlus, int loMinus, int output, float aref) {
m_aref = aref; m_aref = aref;
m_ares = (1 << m_aioOUT->getBit()); m_ares = (1 << m_aioOUT->getBit());
m_callcons = 0;
} }
AD8232::AD8232(std::string initStr) : mraaIo(initStr) AD8232::AD8232(std::string initStr)
{ {
if(!mraaIo.gpios.empty()) mraaIo = new mraa::MraaIo(initStr);
if(mraaIo == NULL)
{ {
m_gpioLOPlus = new mraa::Gpio(mraaIo.gpios[0]); throw std::invalid_argument(std::string(__FUNCTION__) +
m_gpioLOMinus = new mraa::Gpio(mraaIo.gpios[1]); ": Failed to allocate memory for internal member");
}
if(!mraaIo->gpios.empty())
{
m_gpioLOPlus = &mraaIo->gpios[0];
m_gpioLOMinus = &mraaIo->gpios[1];
} }
else else
{ {
@ -54,9 +63,9 @@ AD8232::AD8232(std::string initStr) : mraaIo(initStr)
": mraa_gpio_init() failed, invalid pin?"); ": mraa_gpio_init() failed, invalid pin?");
} }
if(!mraaIo.gpios.empty()) if(!mraaIo->gpios.empty())
{ {
m_aioOUT = new mraa::Aio(mraaIo.aios[0]); m_aioOUT = &mraaIo->aios[0];
} }
else else
{ {
@ -66,9 +75,9 @@ AD8232::AD8232(std::string initStr) : mraaIo(initStr)
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());
} }
for (std::string tok : upmTokens) for (std::string tok : upmTokens)
@ -79,13 +88,21 @@ AD8232::AD8232(std::string initStr) : mraaIo(initStr)
} }
} }
m_ares = (1 << m_aioOUT->getBit()); m_ares = (1 << m_aioOUT->getBit());
m_callcons = 1;
} }
AD8232::~AD8232() AD8232::~AD8232()
{ {
delete m_gpioLOPlus; if(!m_callcons)
delete m_gpioLOMinus; {
delete m_aioOUT; delete m_gpioLOPlus;
delete m_gpioLOMinus;
delete m_aioOUT;
}
else
{
delete mraaIo;
}
} }
int AD8232::value() int AD8232::value()

10
src/ad8232/ad8232.hpp
View File

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