diff --git a/README.md b/README.md index 494d423..e13e3df 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,35 @@ -Node.js bindings to [wiringPi](http://www.wiringpi.com) +Node.js bindings to [wiringPi](http://www.wiringpi.com) (See note below!) Based on the awesome work of [Soarez](https://github.com/Soarez/node-wiring-pi) +This version fixes the BCM identification issue present in the original Wiring-Pi node Module. + +The original version relied on a very old version of Wiring-Pi. + +Note: This version currently only supports Node V6... What this space for a version which supports later versions + +**************************************************** + +Please note: + +This statically linked version of Wiring Pi is not supported in anyway by Gordon Henderson. + +Do not email Gordon with any issues you find with this Package as it is not his responsibility. + +Thanks! + +***************************************************** + ## Install ``` -npm install wiring-pi +npm install wiring-pi-2019 ``` ## Usage ```javascript -var wpi = require('wiring-pi'); +var wpi = require('wiring-pi-2019'); ``` ## Documentation @@ -39,3 +57,4 @@ Chris Continanza | [csquared](https://github.com/csquared) | [@csquared](https:/ Tao Yuan | [taoyuan](https://github.com/taoyuan) | [@taoyvan](https://twitter.com/taoyvan) Tom Janson | [tjanson](https://github.com/tjanson) | Vincent Terraillon | [LouTerrailloune](https://github.com/LouTerrailloune) | [@pure74vincent](https://twitter.com/pure74vincent) +Pete Gallagher | [pjgpetecodes](https://github.com/pjgpetecodes) | [@pete_codes](https://twitter.com/pete_codes) diff --git a/binding.gyp b/binding.gyp index 682c95e..51c55ab 100644 --- a/binding.gyp +++ b/binding.gyp @@ -44,16 +44,15 @@ 'src/devlib/maxdetect.cc', 'src/devlib/piFace.cc', 'src/devlib/piGlow.cc', - 'src/devlib/piNes.cc', - 'src/devlib/tcs34725.cc' + 'src/devlib/piNes.cc' ], 'include_dirs': [ - 'wiringpi/wiringPi', - 'wiringpi/devLib' + 'WiringPi/wiringPi', + 'WiringPi/devLib' ], 'libraries': [ - '/dev/null 1>&2 echo -n "Cloning libWiringPi ... " -rm -Rf ./wiringpi 2>/dev/null 1>&2 -git clone https://github.com/nekuz0r/wiringpi.git -b 2.25 > ./install.log 2>&1 +rm -Rf ./WiringPi 2>/dev/null 1>&2 +git clone https://github.com/WiringPi/WiringPi.git > ./install.log 2>&1 check_git_clone #git submodule init #check_git_clone @@ -48,18 +48,19 @@ check_git_clone #check_git_clone echo "done." -patch ./wiringpi/devLib/Makefile < ./patchs/devLib_Makefile.patch -patch ./wiringpi/gpio/Makefile < ./patchs/gpio_Makefile.patch +patch ./WiringPi/devLib/Makefile < ./patchs/devLib_Makefile.patch +patch ./WiringPi/gpio/Makefile < ./patchs/gpio_Makefile.patch +patch ./WiringPi/wiringPi/Makefile < ./patchs/wiringpi_Makefile.patch echo -n "Making libWiringPi ... " -cd ./wiringpi/wiringPi/ +cd ./WiringPi/wiringPi/ make clean >> ../../install.log 2>&1 make static >> ../../install.log 2>&1 check_make_ok "libWiringPi" 1 cd ../../ echo "done." -cd ./wiringpi/devLib/ +cd ./WiringPi/devLib/ echo -n "Making devLib ..." make clean >> ../../install.log 2>&1 make static >> ../../install.log 2>&1 @@ -67,7 +68,7 @@ check_make_ok "devLib" 0 cd ../../ echo "done." -cd ./wiringpi/gpio/ +cd ./WiringPi/gpio/ echo -n "Unistalling gpio utility ... " sudo make uninstall >> ../../install.log 2>&1 echo "done." diff --git a/package.json b/package.json index a47182d..a818e8d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "wiring-pi", - "version": "2.2.1", - "description": "Bindings to wiringPi", + "name": "wiring-pi-2019", + "version": "1.0.4", + "description": "Bindings to latest wiringPi (Solves BCM Issue) (Node v6 only)", "main": "lib/exports.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", @@ -9,7 +9,7 @@ }, "repository": { "type": "git", - "url": "git@github.com:WiringPi/WiringPi-Node.git" + "url": "git@github.com:pjgpetecodes/WiringPi-Node.git" }, "keywords": [ "wiringPi", @@ -19,10 +19,12 @@ "raspberrypi", "bcm2835" ], - "author": "Igor Soarez ", + "author": "Pete Gallagher ", "contributors": [ "Leandre Gohy ", - "Eugene Ware " + "Eugene Ware ", + "Igor Soarez ", + "Pete Gallagher " ], "license": "BSD" } diff --git a/patchs/devLib_Makefile.patch b/patchs/devLib_Makefile.patch index cb9fc41..ea24123 100644 --- a/patchs/devLib_Makefile.patch +++ b/patchs/devLib_Makefile.patch @@ -1,19 +1,25 @@ --- Makefile_org 2014-07-04 09:48:18.000000000 +0200 +++ Makefile 2014-07-04 10:12:15.000000000 +0200 @@ -26,6 +26,7 @@ - VERSION=$(DYN_VERS_MAJ).$(DYN_VERS_MIN) - DESTDIR=/usr - PREFIX=/local + VERSION=$(shell cat ../VERSION) + DESTDIR?=/usr + PREFIX?=/local +PWD=`pwd` + LDCONFIG?=ldconfig + + ifneq ($V,1) + Q ?= @ + endif + STATIC=libwiringPiDev.a DYNAMIC=libwiringPiDev.so.$(VERSION) -@@ -33,7 +34,7 @@ +@@ -40,7 +41,7 @@ #DEBUG = -g -O0 DEBUG = -O2 CC = gcc -INCLUDE = -I. +INCLUDE = -I. -I$(PWD)/../wiringPi DEFS = -D_GNU_SOURCE - CFLAGS = $(DEBUG) -Wformat=2 -Wall $(INCLUDE) -Winline -pipe -fPIC + CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC diff --git a/patchs/gpio_Makefile.patch b/patchs/gpio_Makefile.patch index e50bfe0..2035970 100644 --- a/patchs/gpio_Makefile.patch +++ b/patchs/gpio_Makefile.patch @@ -2,19 +2,23 @@ +++ Makefile 2014-07-04 10:13:01.000000000 +0200 @@ -25,14 +25,15 @@ - DESTDIR=/usr - PREFIX=/local + DESTDIR?=/usr + PREFIX?=/local +PWD=`pwd` + + ifneq ($V,1) + Q ?= @ + endif #DEBUG = -g -O0 DEBUG = -O2 CC = gcc -INCLUDE = -I$(DESTDIR)$(PREFIX)/include +INCLUDE = -I$(PWD)/../wiringPi -I$(PWD)/../devLib - CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe + CFLAGS = $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe -LDFLAGS = -L$(DESTDIR)$(PREFIX)/lib +LDFLAGS = -L$(PWD)/../wiringPi -L$(PWD)/../devLib - LIBS = -lwiringPi -lwiringPiDev -lpthread -lm + LIBS = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt # May not need to alter anything below this line diff --git a/patchs/wiringpi_Makefile.patch b/patchs/wiringpi_Makefile.patch new file mode 100644 index 0000000..e97f9c8 --- /dev/null +++ b/patchs/wiringpi_Makefile.patch @@ -0,0 +1,35 @@ +--- Makefile 2019-06-09 16:11:11.208024572 +0000 ++++ Makefile_new 2019-06-09 21:53:22.894082583 +0000 +@@ -69,9 +69,13 @@ + + all: $(DYNAMIC) + +-.PHONY: static +-static: +- $Q cat noMoreStatic ++static: $(STATIC) ++ ++$(STATIC): $(OBJ) ++ $Q echo "[Link (Static)]" ++ $Q ar rcs $(STATIC) $(OBJ) ++ $Q ranlib $(STATIC) ++# @size $(STATIC) + + $(DYNAMIC): $(OBJ) + $Q echo "[Link (Dynamic)]" +@@ -104,6 +108,15 @@ + $Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) $(DESTDIR)/lib/libwiringPi.so + $Q $(LDCONFIG) + ++.PHONY: install-static ++install-static: $(STATIC) ++ $Q echo "[Install Headers]" ++ $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/include ++ $Q install -m 0644 $(HEADERS) $(DESTDIR)$(PREFIX)/include ++ $Q echo "[Install Static Lib]" ++ $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib ++ $Q install -m 0755 libwiringPi.a $(DESTDIR)$(PREFIX)/lib ++ + .PHONY: install-deb + install-deb: $(DYNAMIC) + $Q echo "[Install Headers: deb]" diff --git a/src/addon.h b/src/addon.h index 091973e..54c5679 100644 --- a/src/addon.h +++ b/src/addon.h @@ -42,11 +42,11 @@ v8::FunctionTemplate::New(isolate, nodemodule::name)->GetFunction()) #define EXPORT_CONSTANT_INT(name) \ - target->ForceSet(v8::String::NewFromUtf8(isolate, #name, v8::String::kInternalizedString), \ + target->DefineOwnProperty(target->CreationContext(), v8::String::NewFromUtf8(isolate, #name, v8::String::kInternalizedString), \ v8::Int32::New(isolate, name), static_cast(v8::ReadOnly | v8::DontDelete)); #define EXPORT_CONSTANT_STRING(name) \ - target->ForceSet(v8::String::NewFrontUtf8(isolate, #name, v8::String::kInternalizedString), \ + target->DefineOwnProperty(target->CreationContext(), v8::String::NewFromUtf8(isolate, #name, v8::String::kInternalizedString), \ v8::String::NewFromUtf8(isolate, name), static_cast(v8::ReadOnly | v8::DontDelete)); #define EXPORT_CONSTANT_INT_ARRAY(name, array, length) \ @@ -55,7 +55,7 @@ for (int i = 0; i < length; i++) { \ arr->Set(i, v8::Int32::New(isolate, array[i])); \ } \ - target->ForceSet(v8::String::NewFromUtf8(isolate, #name, v8::String::kInternalizedString), \ + target->DefineOwnProperty(target->CreationContext(), v8::String::NewFromUtf8(isolate, #name, v8::String::kInternalizedString), \ arr, static_cast(v8::ReadOnly | v8::DontDelete)); \ } @@ -65,7 +65,7 @@ for (int i = 0; i < length; i++) { \ arr->Set(i, v8::String::NewFromUtf8(isolate, array[i])); \ } \ - target->ForceSet(v8::String::NewFromUtf8(isolate, #name, v8::String::kInternalizedString), \ + target->DefineOwnProperty(target->CreationContext(), v8::String::NewFromUtf8(isolate, #name, v8::String::kInternalizedString), \ arr, static_cast(v8::ReadOnly | v8::DontDelete)); \ } diff --git a/src/devlib/devlib.cc b/src/devlib/devlib.cc index ae4ec04..cb9c609 100644 --- a/src/devlib/devlib.cc +++ b/src/devlib/devlib.cc @@ -8,7 +8,7 @@ #include "piFace.h" #include "piGlow.h" #include "piNes.h" -#include "tcs34725.h" +//#include "tcs34725.h" IMPLEMENT_EXPORT_INIT(devlib) { INIT(ds1302); @@ -19,5 +19,5 @@ IMPLEMENT_EXPORT_INIT(devlib) { INIT(piFace); INIT(piGlow); INIT(piNes); - INIT(tcs34725); -} \ No newline at end of file + //INIT(tcs34725); +} diff --git a/src/devlib/tcs34725.cc b/src/devlib/tcs34725.cc deleted file mode 100644 index b07b27a..0000000 --- a/src/devlib/tcs34725.cc +++ /dev/null @@ -1,259 +0,0 @@ -#include -#include "tcs34725.h" - -DECLARE(tcs34725ReadRGBC); -DECLARE(tcs34725ReadHSV); -DECLARE(tcs34725GetCorrelatedColorTemperature); -DECLARE(tcs34725GetIlluminance); -DECLARE(tcs34725SetInterrupt); -DECLARE(tcs34725ClearInterrupt); -DECLARE(tcs34725SetInterruptLimits); -DECLARE(tcs34725Enable); -DECLARE(tcs34725Disable); -DECLARE(tcs34725Setup); - -IMPLEMENT(tcs34725ReadRGBC) { - SCOPE_OPEN(); - - SET_ARGUMENT_NAME(0, id); - - CHECK_ARGUMENTS_LENGTH_EQUAL(1); - - CHECK_ARGUMENT_TYPE_INT32(0); - - int id = GET_ARGUMENT_AS_INT32(0); - unsigned char r, g, b, c; - - ::tcs34725ReadRGBC(id, &r, &g, &b, &c); - - #if NODE_VERSION_AT_LEAST(0, 11, 0) - Local obj = Object::New(isolate); - obj->Set(String::NewFromUtf8(isolate, "r", v8::String::kInternalizedString), UINT32(r)); - obj->Set(String::NewFromUtf8(isolate, "g", v8::String::kInternalizedString), UINT32(g)); - obj->Set(String::NewFromUtf8(isolate, "b", v8::String::kInternalizedString), UINT32(b)); - obj->Set(String::NewFromUtf8(isolate, "c", v8::String::kInternalizedString), UINT32(c)); - #else - Local obj = Object::New(); - obj->Set(String::NewSymbol("r"), UINT32(r)); - obj->Set(String::NewSymbol("g"), UINT32(g)); - obj->Set(String::NewSymbol("b"), UINT32(b)); - obj->Set(String::NewSymbol("c"), UINT32(c)); - #endif - - SCOPE_CLOSE(obj); -} - -IMPLEMENT(tcs34725ReadHSV) { - SCOPE_OPEN(); - - SET_ARGUMENT_NAME(0, id); - - CHECK_ARGUMENTS_LENGTH_EQUAL(1); - - CHECK_ARGUMENT_TYPE_INT32(0); - - int id = GET_ARGUMENT_AS_INT32(0); - unsigned short h; - unsigned char s, v; - - ::tcs34725ReadHSV(id, &h, &s, &v); - - #if NODE_VERSION_AT_LEAST(0, 11, 0) - Local obj = Object::New(isolate); - obj->Set(String::NewFromUtf8(isolate, "h", v8::String::kInternalizedString), UINT32(h)); - obj->Set(String::NewFromUtf8(isolate, "s", v8::String::kInternalizedString), UINT32(s)); - obj->Set(String::NewFromUtf8(isolate, "v", v8::String::kInternalizedString), UINT32(v)); - #else - Local obj = Object::New(); - obj->Set(String::NewSymbol("h"), UINT32(h)); - obj->Set(String::NewSymbol("s"), UINT32(s)); - obj->Set(String::NewSymbol("v"), UINT32(v)); - #endif - - SCOPE_CLOSE(obj); -} - -IMPLEMENT(tcs34725GetCorrelatedColorTemperature) { - SCOPE_OPEN(); - - SET_ARGUMENT_NAME(0, r); - SET_ARGUMENT_NAME(1, g); - SET_ARGUMENT_NAME(2, b); - - CHECK_ARGUMENTS_LENGTH_EQUAL(3); - - CHECK_ARGUMENT_TYPE_UINT32(0); - CHECK_ARGUMENT_TYPE_UINT32(1); - CHECK_ARGUMENT_TYPE_UINT32(2); - - unsigned short r = GET_ARGUMENT_AS_UINT32(0); - unsigned short g = GET_ARGUMENT_AS_UINT32(1); - unsigned short b = GET_ARGUMENT_AS_UINT32(2); - - unsigned short k = ::tcs34725GetCorrelatedColorTemperature(r, g, b); - - SCOPE_CLOSE(UINT32(k)); -} - -IMPLEMENT(tcs34725GetIlluminance) { - SCOPE_OPEN(); - - SET_ARGUMENT_NAME(0, r); - SET_ARGUMENT_NAME(1, g); - SET_ARGUMENT_NAME(2, b); - - CHECK_ARGUMENTS_LENGTH_EQUAL(3); - - CHECK_ARGUMENT_TYPE_UINT32(0); - CHECK_ARGUMENT_TYPE_UINT32(1); - CHECK_ARGUMENT_TYPE_UINT32(2); - - unsigned short r = GET_ARGUMENT_AS_UINT32(0); - unsigned short g = GET_ARGUMENT_AS_UINT32(1); - unsigned short b = GET_ARGUMENT_AS_UINT32(2); - - unsigned short i = ::tcs34725GetIlluminance(r, g, b); - - SCOPE_CLOSE(UINT32(i)); -} - -IMPLEMENT(tcs34725SetInterrupt) { - SCOPE_OPEN(); - - SET_ARGUMENT_NAME(0, id); - SET_ARGUMENT_NAME(1, aien); - - CHECK_ARGUMENTS_LENGTH_EQUAL(2); - - CHECK_ARGUMENT_TYPE_INT32(0); - CHECK_ARGUMENT_TYPE_INT32(1); - - int id = GET_ARGUMENT_AS_INT32(0); - int aien = GET_ARGUMENT_AS_INT32(1); - - ::tcs34725SetInterrupt(id, aien); - - SCOPE_CLOSE(UNDEFINED()); -} - -IMPLEMENT(tcs34725ClearInterrupt) { - SCOPE_OPEN(); - - SET_ARGUMENT_NAME(0, id); - - CHECK_ARGUMENTS_LENGTH_EQUAL(1); - - CHECK_ARGUMENT_TYPE_INT32(0); - - int id = GET_ARGUMENT_AS_INT32(0); - - ::tcs34725ClearInterrupt(id); - - SCOPE_CLOSE(UNDEFINED()); -} - -IMPLEMENT(tcs34725SetInterruptLimits) { - SCOPE_OPEN(); - - SET_ARGUMENT_NAME(0, id); - SET_ARGUMENT_NAME(1, low); - SET_ARGUMENT_NAME(2, high); - - CHECK_ARGUMENTS_LENGTH_EQUAL(3); - - CHECK_ARGUMENT_TYPE_INT32(0); - CHECK_ARGUMENT_TYPE_UINT32(1); - CHECK_ARGUMENT_TYPE_UINT32(2); - - int id = GET_ARGUMENT_AS_INT32(0); - int low = GET_ARGUMENT_AS_UINT32(1) & 0xFFFF; - int high = GET_ARGUMENT_AS_UINT32(2) & 0xFFFF; - - ::tcs34725SetInterruptLimits(id, low, high); - - SCOPE_CLOSE(UNDEFINED()); -} - -IMPLEMENT(tcs34725Enable) { - SCOPE_OPEN(); - - SET_ARGUMENT_NAME(0, id); - - CHECK_ARGUMENTS_LENGTH_EQUAL(1); - - CHECK_ARGUMENT_TYPE_INT32(0); - - int id = GET_ARGUMENT_AS_INT32(0); - - ::tcs34725Enable(id); - - SCOPE_CLOSE(UNDEFINED()); -} - -IMPLEMENT(tcs34725Disable) { - SCOPE_OPEN(); - - SET_ARGUMENT_NAME(0, id); - - CHECK_ARGUMENTS_LENGTH_EQUAL(1); - - CHECK_ARGUMENT_TYPE_INT32(0); - - int id = GET_ARGUMENT_AS_INT32(0); - - ::tcs34725Disable(id); - - SCOPE_CLOSE(UNDEFINED()); -} - -IMPLEMENT(tcs34725Setup) { - SCOPE_OPEN(); - - SET_ARGUMENT_NAME(0, i2cAddress); - SET_ARGUMENT_NAME(1, integrationTime); - SET_ARGUMENT_NAME(2, gain); - - CHECK_ARGUMENTS_LENGTH_EQUAL(3); - - CHECK_ARGUMENT_TYPE_INT32(0); - CHECK_ARGUMENT_TYPE_INT32(1); - CHECK_ARGUMENT_TYPE_INT32(2); - - int i2cAddress = GET_ARGUMENT_AS_INT32(0); - int integrationTime = GET_ARGUMENT_AS_INT32(1); - int gain = GET_ARGUMENT_AS_INT32(2); - - CHECK_ARGUMENT_IN_INTS(1, integrationTime, (TCS34725_ATIME_2_4MS, TCS34725_ATIME_24MS, TCS34725_ATIME_50MS, TCS34725_ATIME_101MS, TCS34725_ATIME_154MS, TCS34725_ATIME_700MS)); - CHECK_ARGUMENT_IN_INTS(2, gain, (TCS34725_GAIN_1, TCS34725_GAIN_4, TCS34725_GAIN_16, TCS34725_GAIN_60)); - - int id = ::tcs34725Setup(i2cAddress, integrationTime, gain); - - SCOPE_CLOSE(INT32(id)); -} - -IMPLEMENT_EXPORT_INIT(tcs34725) { - EXPORT_FUNCTION(tcs34725ReadRGBC); - EXPORT_FUNCTION(tcs34725ReadHSV); - EXPORT_FUNCTION(tcs34725GetCorrelatedColorTemperature); - EXPORT_FUNCTION(tcs34725GetIlluminance); - EXPORT_FUNCTION(tcs34725SetInterrupt); - EXPORT_FUNCTION(tcs34725ClearInterrupt); - EXPORT_FUNCTION(tcs34725SetInterruptLimits); - EXPORT_FUNCTION(tcs34725Enable); - EXPORT_FUNCTION(tcs34725Disable); - EXPORT_FUNCTION(tcs34725Setup); - - EXPORT_CONSTANT_INT(TCS34725_ATIME_2_4MS); - EXPORT_CONSTANT_INT(TCS34725_ATIME_24MS); - EXPORT_CONSTANT_INT(TCS34725_ATIME_50MS); - EXPORT_CONSTANT_INT(TCS34725_ATIME_101MS); - EXPORT_CONSTANT_INT(TCS34725_ATIME_154MS); - EXPORT_CONSTANT_INT(TCS34725_ATIME_700MS); - - EXPORT_CONSTANT_INT(TCS34725_GAIN_1); - EXPORT_CONSTANT_INT(TCS34725_GAIN_4); - EXPORT_CONSTANT_INT(TCS34725_GAIN_16); - EXPORT_CONSTANT_INT(TCS34725_GAIN_60); - - EXPORT_CONSTANT_INT(TCS34725_MAX_TCS34725); -} \ No newline at end of file diff --git a/src/devlib/tcs34725.h b/src/devlib/tcs34725.h deleted file mode 100644 index 7655481..0000000 --- a/src/devlib/tcs34725.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _WPI_TCS34725_H_ -#define _WPI_TCS34725_H_ - - #include "../addon.h" - - DECLARE_EXPORT_INIT(tcs34725); - -#endif \ No newline at end of file diff --git a/src/wiringPi.cc b/src/wiringPi.cc index 9fedf97..ac600da 100644 --- a/src/wiringPi.cc +++ b/src/wiringPi.cc @@ -18,7 +18,7 @@ DECLARE(digitalWrite); DECLARE(pwmWrite); DECLARE(analogRead); DECLARE(analogWrite); -DECLARE(pulseIn); +//DECLARE(pulseIn); DECLARE(delay); DECLARE(delayMicroseconds); @@ -347,26 +347,26 @@ IMPLEMENT(analogWrite) { SCOPE_CLOSE(UNDEFINED()); } -IMPLEMENT(pulseIn) { - SCOPE_OPEN(); +//IMPLEMENT(pulseIn) { +// SCOPE_OPEN(); - SET_ARGUMENT_NAME(0, pin); - SET_ARGUMENT_NAME(1, state); +// SET_ARGUMENT_NAME(0, pin); +// SET_ARGUMENT_NAME(1, state); - CHECK_ARGUMENTS_LENGTH_EQUAL(2); +// CHECK_ARGUMENTS_LENGTH_EQUAL(2); - CHECK_ARGUMENT_TYPE_INT32(0); - CHECK_ARGUMENT_TYPE_INT32(1); +// CHECK_ARGUMENT_TYPE_INT32(0); +// CHECK_ARGUMENT_TYPE_INT32(1); - int pin = GET_ARGUMENT_AS_INT32(0); - int state = GET_ARGUMENT_AS_INT32(1); +// int pin = GET_ARGUMENT_AS_INT32(0); +// int state = GET_ARGUMENT_AS_INT32(1); - CHECK_ARGUMENT_IN_INTS(1, state, (HIGH, LOW)); +// CHECK_ARGUMENT_IN_INTS(1, state, (HIGH, LOW)); - int us = ::pulseIn(pin, state); +// int us = ::pulseIn(pin, state); - SCOPE_CLOSE(INT32(us)); -} +// SCOPE_CLOSE(INT32(us)); +// } IMPLEMENT(delay) { SCOPE_OPEN(); @@ -689,7 +689,7 @@ IMPLEMENT_EXPORT_INIT(wiringPi) { EXPORT_FUNCTION(pwmWrite); EXPORT_FUNCTION(analogRead); EXPORT_FUNCTION(analogWrite); - EXPORT_FUNCTION(pulseIn); + //EXPORT_FUNCTION(pulseIn); EXPORT_FUNCTION(delay); EXPORT_FUNCTION(delayMicroseconds); @@ -741,7 +741,7 @@ IMPLEMENT_EXPORT_INIT(wiringPi) { EXPORT_CONSTANT_INT(PWM_MODE_MS); // piBoardId - EXPORT_CONSTANT_INT(PI_MODEL_UNKNOWN); + //EXPORT_CONSTANT_INT(PI_MODEL_UNKNOWN); EXPORT_CONSTANT_INT(PI_MODEL_A); EXPORT_CONSTANT_INT(PI_MODEL_B); EXPORT_CONSTANT_INT(PI_MODEL_BP); @@ -749,7 +749,7 @@ IMPLEMENT_EXPORT_INIT(wiringPi) { EXPORT_CONSTANT_INT(PI_MODEL_AP); EXPORT_CONSTANT_INT(PI_MODEL_2); - EXPORT_CONSTANT_INT(PI_VERSION_UNKNOWN); + //EXPORT_CONSTANT_INT(PI_VERSION_UNKNOWN); EXPORT_CONSTANT_INT(PI_VERSION_1); EXPORT_CONSTANT_INT(PI_VERSION_1_1); EXPORT_CONSTANT_INT(PI_VERSION_1_2); @@ -758,8 +758,8 @@ IMPLEMENT_EXPORT_INIT(wiringPi) { EXPORT_CONSTANT_INT(PI_MAKER_UNKNOWN); EXPORT_CONSTANT_INT(PI_MAKER_EGOMAN); EXPORT_CONSTANT_INT(PI_MAKER_SONY); - EXPORT_CONSTANT_INT(PI_MAKER_QISDA); - EXPORT_CONSTANT_INT(PI_MAKER_MBEST); + //EXPORT_CONSTANT_INT(PI_MAKER_QISDA); + //EXPORT_CONSTANT_INT(PI_MAKER_MBEST); EXPORT_CONSTANT_STRING_ARRAY(PI_MODEL_NAMES, piModelNames, 7); EXPORT_CONSTANT_STRING_ARRAY(PI_REVISION_NAMES, piRevisionNames, 5); diff --git a/src/wiringPiISR.cc b/src/wiringPiISR.cc index 70fbede..4510283 100644 --- a/src/wiringPiISR.cc +++ b/src/wiringPiISR.cc @@ -170,6 +170,7 @@ IMPLEMENT(wiringPiISR) { SCOPE_CLOSE(UNDEFINED()); } + /* DECLARE(wiringPiISRCancel); IMPLEMENT(wiringPiISRCancel) { SCOPE_OPEN(); @@ -187,6 +188,7 @@ IMPLEMENT(wiringPiISRCancel) { SCOPE_CLOSE(UNDEFINED()); } +*/ IMPLEMENT_EXPORT_INIT(wiringPiISR) { REGISTER_NATIVE_INTERRUPT_HANDLER(0); @@ -255,7 +257,7 @@ IMPLEMENT_EXPORT_INIT(wiringPiISR) { REGISTER_NATIVE_INTERRUPT_HANDLER(63); EXPORT_FUNCTION(wiringPiISR); - EXPORT_FUNCTION(wiringPiISRCancel); + //EXPORT_FUNCTION(wiringPiISRCancel); EXPORT_CONSTANT_INT(INT_EDGE_FALLING); EXPORT_CONSTANT_INT(INT_EDGE_RISING);