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

Removed commented code

Browse Source 
Ran clang-format on modified files

Signed-off-by: Serban Waltter <serban.waltter@rinftech.com>
This commit is contained in:
Serban Waltter
2018-07-12 16:16:45 +03:00
parent f870362923
commit 2acecb1e62
9 changed files with 177 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/maxsonarez/maxsonarez.cxx
View File

@ -23,8 +23,8 @@
*/
#include <iostream>
#include <string>
#include <stdexcept>
#include <string>
#include "maxsonarez.hpp"
@ -33,37 +33,38 @@ using namespace upm;
MAXSONAREZ::MAXSONAREZ(int pin, float aref)
{
if (!(m_aio = mraa_aio_init(pin)))
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init() failed, invalid pin?");
return;
if (!(m_aio = mraa_aio_init(pin))) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_aio_init() failed, invalid pin?");
return;
}
m_aRes = (1 << mraa_aio_get_bit(m_aio));
m_aref = aref;
m_aRes = (1 << mraa_aio_get_bit(m_aio));
m_aref = aref;
// volt's per inch of this sensor
m_vI = (m_aref / MAXSONAREZ_RES);
// volt's per inch of this sensor
m_vI = (m_aref / MAXSONAREZ_RES);
}
MAXSONAREZ::~MAXSONAREZ()
{
mraa_aio_close(m_aio);
mraa_aio_close(m_aio);
}
int MAXSONAREZ::inches()
int
MAXSONAREZ::inches()
{
int val = mraa_aio_read(m_aio);
if (val == -1) {
return -1;
}
float volts = float(val) * (m_aref / m_aRes);
int val = mraa_aio_read(m_aio);
if (val == -1) {
return -1;
}
float volts = float(val) * (m_aref / m_aRes);
return int(volts / m_vI);
return int(volts / m_vI);
}
float MAXSONAREZ::getDistance()
float
MAXSONAREZ::getDistance()
{
return inches() * 2.54;
return inches() * 2.54;
}