mirror of
https://github.com/eclipse/upm.git
synced 2025-03-14 20:47:30 +03:00
Modified all iDistance sensors to return float.
Signed-off-by: Serban Waltter <serban.waltter@rinftech.com>
This commit is contained in:
parent
9653ef27b8
commit
39515cb8ee
@ -36,7 +36,7 @@ namespace upm
|
||||
{
|
||||
public:
|
||||
virtual ~iDistance() {}
|
||||
virtual int getDistance() = 0;
|
||||
virtual float getDistance() = 0;
|
||||
/**
|
||||
* Convert distance value from Cm(default) to one
|
||||
* of the following:
|
||||
|
@ -55,7 +55,7 @@ GroveUltraSonic::~GroveUltraSonic () {
|
||||
mraa_gpio_close (m_pinCtx);
|
||||
}
|
||||
|
||||
int
|
||||
float
|
||||
GroveUltraSonic::getDistance () {
|
||||
|
||||
// output trigger signal
|
||||
|
@ -81,7 +81,7 @@ class GroveUltraSonic {
|
||||
* Divide by 58 to convert distance to centimetres.
|
||||
* Divide by 148 to convert distance to inches.
|
||||
*/
|
||||
int getDistance ();
|
||||
float getDistance ();
|
||||
|
||||
/**
|
||||
* Return name of the component
|
||||
|
@ -50,7 +50,7 @@ HCSR04::getDistance(HCSR04_U unit)
|
||||
return hcsr04_get_distance(m_hcsr04, unit);
|
||||
}
|
||||
|
||||
int
|
||||
float
|
||||
HCSR04::getDistance()
|
||||
{
|
||||
return getDistance(HCSR04_CM);
|
||||
|
@ -76,7 +76,7 @@ class HCSR04 : virtual public iDistance {
|
||||
*
|
||||
* @return distance measured in cm.
|
||||
*/
|
||||
virtual int getDistance();
|
||||
float getDistance();
|
||||
private:
|
||||
hcsr04_context m_hcsr04;
|
||||
HCSR04(const HCSR04& src) { /* do not create copied constructor */ }
|
||||
|
@ -46,7 +46,7 @@ LIDARLITEV3::LIDARLITEV3 (int bus, int devAddr) : m_i2ControlCtx(bus) {
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
float
|
||||
LIDARLITEV3::getDistance () {
|
||||
|
||||
if(i2cWriteReg(ACQ_COMMAND, 0x04) < 0)
|
||||
|
@ -110,7 +110,7 @@ class LIDARLITEV3 : virtual public iDistance {
|
||||
* Returns distance measurement on success
|
||||
* Retruns -1 on failure.
|
||||
*/
|
||||
virtual int getDistance ();
|
||||
virtual float getDistance ();
|
||||
|
||||
/**
|
||||
* Read
|
||||
|
@ -63,7 +63,7 @@ int MAXSONAREZ::inches()
|
||||
return int(volts / m_vI);
|
||||
}
|
||||
|
||||
int MAXSONAREZ::getDistance()
|
||||
float MAXSONAREZ::getDistance()
|
||||
{
|
||||
return (inches() * 2.54);
|
||||
return inches() * 2.54;
|
||||
}
|
||||
|
@ -96,7 +96,7 @@ namespace upm {
|
||||
*
|
||||
* @return Distance to the object in inches
|
||||
*/
|
||||
virtual int getDistance();
|
||||
virtual float getDistance();
|
||||
|
||||
private:
|
||||
mraa_aio_context m_aio;
|
||||
|
@ -48,7 +48,7 @@ int MB704X::getRange()
|
||||
return mb704x_get_range(m_mb704x);
|
||||
}
|
||||
|
||||
int MB704X::getDistance()
|
||||
float MB704X::getDistance()
|
||||
{
|
||||
return getRange();
|
||||
}
|
||||
|
@ -90,7 +90,7 @@ namespace upm {
|
||||
*
|
||||
* @return Distance to the object in cm
|
||||
*/
|
||||
virtual int getDistance();
|
||||
virtual float getDistance();
|
||||
protected:
|
||||
// mb704x device context
|
||||
mb704x_context m_mb704x;
|
||||
|
@ -55,7 +55,7 @@ UltraSonic::~UltraSonic () {
|
||||
mraa_gpio_close (m_pinCtx);
|
||||
}
|
||||
|
||||
int
|
||||
float
|
||||
UltraSonic::getDistance () {
|
||||
|
||||
// output trigger signal
|
||||
|
@ -80,7 +80,7 @@ class UltraSonic {
|
||||
* Divide by 58 to convert distance to centimetres.
|
||||
* Divide by 148 to convert distance to inches.
|
||||
*/
|
||||
int getDistance ();
|
||||
float getDistance ();
|
||||
|
||||
/**
|
||||
* Return name of the component
|
||||
@ -93,7 +93,7 @@ class UltraSonic {
|
||||
/**
|
||||
* Returns true while the sensor is busy waiting for the echo pulse
|
||||
*/
|
||||
bool working()
|
||||
float working()
|
||||
{
|
||||
return m_doWork;
|
||||
}
|
||||
|
@ -67,7 +67,7 @@ float URM37::getDistance(int degrees)
|
||||
return (distance);
|
||||
}
|
||||
|
||||
int URM37::getDistance()
|
||||
float URM37::getDistance()
|
||||
{
|
||||
/* TODO: compilation issue for swig. switched original method to not use default zero parameter. */
|
||||
return getDistance(0);
|
||||
|
@ -129,7 +129,7 @@ namespace upm {
|
||||
*
|
||||
* @return The measured distance in cm
|
||||
*/
|
||||
virtual int getDistance();
|
||||
virtual float getDistance();
|
||||
|
||||
/**
|
||||
* Get the temperature measurement. This is only valid in UART mode.
|
||||
|
Loading…
x
Reference in New Issue
Block a user