alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-02 01:41:12 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

java: solved callbacks

Browse Source 
Signed-off-by: Stefan Andritoiu <stefan.andritoiu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Stefan Andritoiu
2015-08-19 19:27:16 +03:00
committed by Mihai Tudor Panu
parent 323905a215
commit 19bcbc7c42
13 changed files with 108 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/hcsr04/hcsr04.cxx
View File

@ -31,6 +31,14 @@
using namespace upm;
#ifdef SWIGJAVA
void
HCSR04::HCSR04 (uint8_t triggerPin, uint8_t echoPin, IsrCallback *cb);
{
HCSR04 (triggerPin, echoPin, generic_callback_isr);
}
#endif
HCSR04::HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void *)) {
mraa_result_t error = MRAA_SUCCESS;
m_name = "HCSR04";

12
src/hcsr04/hcsr04.h
View File

@ -29,6 +29,10 @@
#include <mraa/pwm.h>
#include <sys/time.h>
#ifdef SWIGJAVA
#include "../IsrCallback.h"
#endif
#define HIGH 1
#define LOW 0
@ -58,6 +62,9 @@ namespace upm {
*/
class HCSR04 {
public:
#ifdef SWIGJAVA
HCSR04 (uint8_t triggerPin, uint8_t echoPin, IsrCallback *cb);
#else
/**
* Instantiates an HCSR04 object
*
@ -67,7 +74,7 @@ class HCSR04 {
* falling-edge interrupts
*/
HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void *));
#endif
/**
* HCSR04 object destructor
*/
@ -96,6 +103,9 @@ class HCSR04 {
}
private:
#ifdef SWIGJAVA
HCSR04 (uint8_t triggerPin, uint8_t echoPin, void (*fptr)(void *));
#endif
mraa_pwm_context m_pwmTriggerCtx;
mraa_gpio_context m_echoPinCtx;

5
src/hcsr04/javaupm_hcsr04.i
View File

@ -1,6 +1,11 @@
%module javaupm_hcsr04
%include "../upm.i"
%feature("director") IsrCallback;
%ignore generic_callback_isr;
%include "../IsrCallback.h"
%{
#include "hcsr04.h"
%}