mirror of
https://github.com/eclipse/upm.git
synced 2025-07-02 09:51:14 +03:00
Button: Removed grove dependency
* Renamed all files from groverrotary to rotary
* Replaced all instances of groverrotary with rotary
* Updated all CMake files
Signed-off-by: Sisinty Sasmita Patra <sisinty.s.patra@intel.com>
This commit is contained in:
Sisinty Sasmita Patra
committed by
Noel Eck
Noel Eck
parent
6a6a572069
commit
3753a1be5c
@ -1,7 +1,7 @@
|
||||
upm_mixed_module_init (NAME grove
|
||||
DESCRIPTION "upm grove module"
|
||||
CPP_HDR grovebutton.hpp groveled.hpp
|
||||
CPP_HDR groveled.hpp
|
||||
grovetemp.hpp grovebase.hpp grove.hpp
|
||||
CPP_SRC grovebutton.cxx groveled.cxx
|
||||
CPP_SRC groveled.cxx
|
||||
grovetemp.cxx
|
||||
REQUIRES mraa)
|
||||
|
||||
@ -25,6 +25,6 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <grovebutton.hpp>
|
||||
#include <button.hpp>
|
||||
#include <groveled.hpp>
|
||||
#include <grovetemp.hpp>
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
/*
|
||||
* Authors: Brendan Le Foll <brendan.le.foll@intel.com>
|
||||
* Mihai Tudor Panu <mihai.tudor.panu@intel.com>
|
||||
* Sarah Knepper <sarah.knepper@intel.com>
|
||||
* Copyright (c) 2014 - 2016 Intel Corporation.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <stdexcept>
|
||||
|
||||
#include "grovebutton.hpp"
|
||||
|
||||
using namespace upm;
|
||||
|
||||
GroveButton::GroveButton(unsigned int pin)
|
||||
{
|
||||
if ( !(m_gpio = mraa_gpio_init(pin)) ) {
|
||||
throw std::invalid_argument(std::string(__FUNCTION__) +
|
||||
": mraa_gpio_init() failed, invalid pin?");
|
||||
return;
|
||||
}
|
||||
mraa_gpio_dir(m_gpio, MRAA_GPIO_IN);
|
||||
m_name = "Button Sensor";
|
||||
}
|
||||
|
||||
GroveButton::~GroveButton()
|
||||
{
|
||||
mraa_gpio_close(m_gpio);
|
||||
}
|
||||
|
||||
std::string GroveButton::name()
|
||||
{
|
||||
return m_name;
|
||||
}
|
||||
|
||||
int GroveButton::value()
|
||||
{
|
||||
return mraa_gpio_read(m_gpio);
|
||||
}
|
||||
|
||||
#ifdef JAVACALLBACK
|
||||
void GroveButton::installISR(mraa::Edge level, jobject runnable)
|
||||
{
|
||||
installISR(level, mraa_java_isr_callback, runnable);
|
||||
}
|
||||
#endif
|
||||
|
||||
void GroveButton::installISR(mraa::Edge level, void (*isr)(void *), void *arg)
|
||||
{
|
||||
if (m_isrInstalled)
|
||||
uninstallISR();
|
||||
|
||||
// install our interrupt handler
|
||||
mraa_gpio_isr(m_gpio, (mraa_gpio_edge_t) level, isr, arg);
|
||||
m_isrInstalled = true;
|
||||
}
|
||||
|
||||
void GroveButton::uninstallISR()
|
||||
{
|
||||
mraa_gpio_isr_exit(m_gpio);
|
||||
m_isrInstalled = false;
|
||||
}
|
||||
@ -1,104 +0,0 @@
|
||||
/*
|
||||
* Authors: Brendan Le Foll <brendan.le.foll@intel.com>
|
||||
* Mihai Tudor Panu <mihai.tudor.panu@intel.com>
|
||||
* Sarah Knepper <sarah.knepper@intel.com>
|
||||
* Copyright (c) 2014 - 2016 Intel Corporation.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <string>
|
||||
#include <mraa/gpio.hpp>
|
||||
#include "grovebase.hpp"
|
||||
|
||||
namespace upm {
|
||||
|
||||
/**
|
||||
* @library grove
|
||||
* @sensor grovebutton
|
||||
* @comname Grove Button
|
||||
* @altname Grove Touch Sensor
|
||||
* @type button touch
|
||||
* @man seeed
|
||||
* @con gpio
|
||||
* @kit gsk
|
||||
*
|
||||
* @brief API for the Grove Button
|
||||
*
|
||||
* Basic UPM module for the Grove button
|
||||
*
|
||||
* @image html grovebutton.jpg
|
||||
* @snippet grovebutton.cxx Interesting
|
||||
*/
|
||||
class GroveButton: public Grove {
|
||||
public:
|
||||
/**
|
||||
* Grove button constructor
|
||||
*
|
||||
* @param gpio Pin to use
|
||||
*/
|
||||
GroveButton(unsigned int pin);
|
||||
/**
|
||||
* Grove button destructor
|
||||
*/
|
||||
~GroveButton();
|
||||
/**
|
||||
* Gets the name of the sensor
|
||||
*
|
||||
* @return Name of this sensor
|
||||
*/
|
||||
std::string name();
|
||||
/**
|
||||
* Gets the value from the GPIO pin
|
||||
*
|
||||
* @return Value from the GPIO pin
|
||||
*/
|
||||
int value();
|
||||
|
||||
/**
|
||||
* Installs an interrupt service routine (ISR) to be called when
|
||||
* the button is activated or deactivated.
|
||||
*
|
||||
* @param fptr Pointer to a function to be called on interrupt
|
||||
* @param arg Pointer to an object to be supplied as an
|
||||
* argument to the ISR.
|
||||
*/
|
||||
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
|
||||
void installISR(mraa::Edge level, jobject runnable);
|
||||
#else
|
||||
void installISR(mraa::Edge level, void (*isr)(void *), void *arg);
|
||||
#endif
|
||||
/**
|
||||
* Uninstalls the previously installed ISR
|
||||
*
|
||||
*/
|
||||
void uninstallISR();
|
||||
|
||||
private:
|
||||
#if defined(SWIGJAVA) || defined(JAVACALLBACK)
|
||||
void installISR(mraa::Edge level, void (*isr)(void *), void *arg);
|
||||
#endif
|
||||
bool m_isrInstalled;
|
||||
std::string m_name;
|
||||
mraa_gpio_context m_gpio;
|
||||
};
|
||||
}
|
||||
@ -14,9 +14,9 @@
|
||||
#include "grovebase.hpp"
|
||||
%}
|
||||
|
||||
%include "grovebutton.hpp"
|
||||
%include "button.hpp"
|
||||
%{
|
||||
#include "grovebutton.hpp"
|
||||
#include "button.hpp"
|
||||
%}
|
||||
|
||||
%include "groveled.hpp"
|
||||
|
||||
@ -11,9 +11,9 @@
|
||||
#include "grovebase.hpp"
|
||||
%}
|
||||
|
||||
%include "grovebutton.hpp"
|
||||
%include "button.hpp"
|
||||
%{
|
||||
#include "grovebutton.hpp"
|
||||
#include "button.hpp"
|
||||
%}
|
||||
|
||||
%include "groveled.hpp"
|
||||
|
||||
@ -15,9 +15,9 @@
|
||||
#include "grovebase.hpp"
|
||||
%}
|
||||
|
||||
%include "grovebutton.hpp"
|
||||
%include "button.hpp"
|
||||
%{
|
||||
#include "grovebutton.hpp"
|
||||
#include "button.hpp"
|
||||
%}
|
||||
|
||||
%include "groveled.hpp"
|
||||
|
||||
Reference in New Issue
Block a user