alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-26 21:51:16 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some issues for string based constructors

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-27 15:46:16 +03:00
committed by Mihai Tudor Panu
parent 8f11061de3
commit 2975bae075
22 changed files with 257 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/adxl335/adxl335.cxx
View File

@ -76,25 +76,32 @@ ADXL335::ADXL335(std::string initStr) : mraaIo(initStr)
if(!descs->aios)
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init(X) failed, invalid pin?");
": mraa_aio_init(X) failed, invalid pin?");
}
else
{
printf("ADXL335 else inside constructor\n");
if( !(m_aioX = descs->aios[0]) )
if(descs->n_aio == 3)
{
if( !(m_aioX = descs->aios[0]) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init(X) failed, invalid pin?");
}
if( !(m_aioY = descs->aios[1]) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init(X) failed, invalid pin?");
}
if( !(m_aioZ = descs->aios[2]) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init(X) failed, invalid pin?");
}
} else
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init(X) failed, invalid pin?");
}
if( !(m_aioY = descs->aios[1]) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init(X) failed, invalid pin?");
}
if( !(m_aioZ = descs->aios[2]) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init(X) failed, invalid pin?");
": mraa_aio_init(X) must initialize three pins");
}
}
@ -105,7 +112,7 @@ ADXL335::ADXL335(std::string initStr) : mraaIo(initStr)
}
for (std::string tok : upmTokens) {
if(tok.substr(0,5) == "aref:") {
if(tok.substr(0, 5) == "aref:") {
m_aref = std::stof(tok.substr(5));
}
}