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

Collision Sensor: Add string based constructor

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-24 17:00:48 +03:00 committed by Mihai Tudor Panu
parent 582decd4f7
commit a3bf6d76a9
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/collision/collision.cxx
View File

@ -26,13 +26,13 @@
#include <stdexcept>
#include "collision.hpp"
#include "upm_string_parser.hpp"
using namespace upm;
Collision::Collision(int pin)
{
if ( !(m_gpio = mraa_gpio_init(pin)) )
if ( !(m_gpio = mraa_gpio_init(pin)) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init() failed, invalid pin?");
@ -41,6 +41,20 @@ Collision::Collision(int pin)
mraa_gpio_dir(m_gpio, MRAA_GPIO_IN);
}
Collision::Collision(std::string initStr) : mraaIo(initStr)
{
mraa_io_descriptor* descs = mraaIo.getMraaDescriptors();
if(!descs->gpios) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init() failed, invalid pin?");
} else {
if( !(m_gpio = descs->gpios[0]) ) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init() failed, invalid pin?");
}
}
}
Collision::~Collision()
{
mraa_gpio_close(m_gpio);

12
src/collision/collision.hpp
View File

@ -23,6 +23,7 @@
*/
#pragma once
#include <mraa/initio.hpp>
#include <mraa/gpio.h>
#include <interfaces/iCollision.hpp>
@ -59,6 +60,12 @@ namespace upm {
* @param pin Digital pin to use
*/
Collision(int pin);
/**
* Instantiates Collision Sensor based on a given string.
*
* @param initStr string containing specific information for Collision Sensor.
*/
Collision(std::string initStr);
/**
* Collision destructor
*/
@ -69,6 +76,7 @@ namespace upm {
virtual bool isColliding();
private:
mraa_gpio_context m_gpio;
};
mraa_gpio_context m_gpio;
mraa::MraaIo mraaIo;
};
}