Merge pull request #7 from nekuz0r/incoming

v1.1.1
WiringPi · Jul 4, 2014 · ec666bb · ec666bb
2 parents 6a156eb + d831507
commit ec666bb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/lib/exports.js b/lib/exports.js
@@ -68,6 +68,7 @@ exports = {
   // PI Model type
   PI_MODEL_A: 0,
   PI_MODEL_B: 1,
+  PI_MODEL_CM: 2,
 
   // PI Model names
   PI_MODEL_NAMES: [

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wiring-pi",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Bindings to wiringPi",
   "main": "lib/exports.js",
   "scripts": {

diff --git a/src/bindings.cc b/src/bindings.cc
@@ -314,7 +314,7 @@ IMPLEMENT(pinMode) {
   mode = args[1]->NumberValue();
 
   // CHECK: Allowed values
-  if (mode != INPUT && mode != OUTPUT && mode != PWM_OUTPUT && mode != GPIO_CLOCK) {
+  if (mode != INPUT && mode != OUTPUT && mode != PWM_OUTPUT && mode != GPIO_CLOCK && mode != SOFT_PWM_OUTPUT && mode != SOFT_TONE_OUTPUT) {
     ThrowException(Exception::TypeError(
       String::New("Incorrect mode value. INPUT, OUTPUT, PWM_OUTPUT or GPIO_CLOCK expected.")));
     return scope.Close(Undefined());
@@ -2243,10 +2243,7 @@ IMPLEMENT(serialPuts) {
 // Func : void serialPrintf(const int fd, const char* message, ...)
 
 IMPLEMENT(serialPrintf) {
-  HandleScope scope;
-  ThrowException(Exception::TypeError(
-    String::New("Not implemented")));
-  return scope.Close(Undefined());
+  return serialPuts(args);
 }
 
 // Func : int serialDataAvail(const int fd)