alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-27 14:11:15 +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>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Serban Waltter
2018-07-12 16:16:45 +03:00
committed by Mihai Tudor Panu
parent 664c6dd8c6
commit 57c0c8c235
9 changed files with 177 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/groveultrasonic/groveultrasonic.cxx
View File

@ -24,16 +24,17 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <iostream>
#include <unistd.h>
#include <stdlib.h>
#include <functional>
#include <iostream>
#include <stdlib.h>
#include <unistd.h>
#include "groveultrasonic.hpp"
using namespace upm;
GroveUltraSonic::GroveUltraSonic (int pin) {
GroveUltraSonic::GroveUltraSonic(int pin)
{
m_name = "GroveUltraSonic";
mraa_init();
@ -41,23 +42,23 @@ GroveUltraSonic::GroveUltraSonic (int pin) {
// setup pin
m_pinCtx = mraa_gpio_init(pin);
if (m_pinCtx == NULL) {
fprintf (stderr, "Are you sure that pin%d you requested is valid on your platform?", pin);
exit (1);
fprintf(stderr, "Are you sure that pin%d you requested is valid on your platform?", pin);
exit(1);
}
mraa_gpio_isr (m_pinCtx, MRAA_GPIO_EDGE_BOTH,
&signalISR, this);
}
GroveUltraSonic::~GroveUltraSonic () {
GroveUltraSonic::~GroveUltraSonic()
{
// close pin
mraa_gpio_isr_exit(m_pinCtx);
mraa_gpio_close (m_pinCtx);
mraa_gpio_close(m_pinCtx);
}
float
GroveUltraSonic::getDistance () {
GroveUltraSonic::getDistance()
{
// output trigger signal
mraa_gpio_dir(m_pinCtx, MRAA_GPIO_OUT);
mraa_gpio_write(m_pinCtx, LOW);
@ -86,13 +87,15 @@ GroveUltraSonic::getDistance () {
}
void
GroveUltraSonic::signalISR(void *ctx) {
upm::GroveUltraSonic *This = (upm::GroveUltraSonic *)ctx;
GroveUltraSonic::signalISR(void* ctx)
{
upm::GroveUltraSonic* This = (upm::GroveUltraSonic*) ctx;
This->ackEdgeDetected();
}
void
GroveUltraSonic::ackEdgeDetected () {
GroveUltraSonic::ackEdgeDetected()
{
if (++m_InterruptCounter % 2 == 0) {
gettimeofday(&m_FallingTimeStamp, NULL);
m_doWork = false;