Raspberries/upm
Public Access
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hcsr04: fixes driver and addresses issue #207

Browse Source 
Signed-off-by: Rafael Neri <rafael.neri@gmail.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Rafael Neri
2015-08-27 22:39:09 -03:00
committed by Mihai Tudor Panu
parent 0bc1930cf5
commit 5a62602a11
4 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/hcsr04/hcsr04.h
View File

@@ -1,6 +1,7 @@
/*
/*
* Author: Yevgeniy Kiveisha <yevgeniy.kiveisha@intel.com>
* Copyright (c) 2014 Intel Corporation.
* Author: Rafael Neri <rafael.neri@gmail.com>
* Copyright (c) 2014-2015 Intel Corporation.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -33,11 +34,8 @@
#include "../IsrCallback.h"
#endif
#define HIGH 1
#define LOW 0
#define MAX_PERIOD 7968
#define TRIGGER_PULSE 10
#define CM 1
#define INC 0
namespace upm {
/**
@@ -62,9 +60,6 @@ namespace upm {
*/
class HCSR04 {
public:
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
HCSR04 (uint8_t triggerPin, uint8_t echoPin, IsrCallback *cb);
#else
/**
* Instantiates an HCSR04 object
*
@@ -73,6 +68,9 @@ class HCSR04 {
* @param fptr Function pointer to handle rising-edge and
* falling-edge interrupts
*/
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
HCSR04 (uint8_t triggerPin, uint8_t echoPin, IsrCallback *cb);
#else
HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void *));
#endif
/**
@@ -83,7 +81,7 @@ class HCSR04 {
/**
* Gets the distance from the sensor
*/
int getDistance ();
double getDistance (int sys);
/**
* On each interrupt, this function detects if the interrupt
@@ -106,10 +104,10 @@ class HCSR04 {
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void *));
#endif
mraa_pwm_context m_pwmTriggerCtx;
mraa_gpio_context m_echoPinCtx;
double timing();
mraa_gpio_context m_triggerPinCtx;
mraa_gpio_context m_echoPinCtx;
uint8_t m_waitEcho;
long m_RisingTimeStamp;
long m_FallingTimeStamp;
uint8_t m_InterruptCounter;