rpi_gpio 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4059220d806257737dc29e65f4539e82e36a8c44
-  data.tar.gz: 1b0c4294c22a09525f19f050fc2a2bdbccc4f374
+  metadata.gz: bb3eca91931a655322781bb97858870321541c69
+  data.tar.gz: 283cd9f48b7af7d11db72fd3d38118ebd9d12a19
 SHA512:
-  metadata.gz: 710e9e5d14f5397473c63a855af0f6d0755ef252eb9e6372c5f1dc1081bb62ea01813da466e2baac4c7d552d5b2d5108e5bddb0411e2cabd3ba0e252fbc34ad1
-  data.tar.gz: 9d2dda1389655992ebf9c3406011fc881b622d449a9e9196093e3c3f5b762e63688c310f468f564af471eaf94d8d20eb2052adc255bbef8ae56f7f2968b97514
+  metadata.gz: e603d6197144360f18af04c48dc3c9dcb8bc5ffc63e8050817e30d8ff4fa14728cb63b60506f879eb3f078ef5e9dfb7ee34158378c47317b3e9c6c46d9bbd2fe
+  data.tar.gz: 7042bb0dbed8696695e63f86449d81167f2e1f1ac9ee166a10b6b6a73aa3abf308947b253926c57df66a970d5a0da891e2edc1829468827d8d33eb67b5d9dccc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rpi_gpio (0.1.2)
+    rpi_gpio (0.1.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,4 +1,4 @@
-#rpi_gpio v0.1.3
+#rpi_gpio v0.1.4
 
 Ruby conversion of [RPi.GPIO Python module](https://pypi.python.org/pypi/RPi.GPIO)
 

data/ext/rpi_gpio/c_gpio.c

@@ -166,9 +166,9 @@ void set_pullupdn(int gpio, int pud)
     int shift = (gpio%32);
     
     if (pud == PUD_DOWN)
-       *(gpio_map+PULLUPDN_OFFSET) = (*(gpio_map+PULLUPDN_OFFSET) & ~3) | PUD_DOWN;
+       *(gpio_map+PULLUPDN_OFFSET) = (*(gpio_map+PULLUPDN_OFFSET)&~3)|PUD_DOWN;
     else if (pud == PUD_UP)
-       *(gpio_map+PULLUPDN_OFFSET) = (*(gpio_map+PULLUPDN_OFFSET) & ~3) | PUD_UP;
+       *(gpio_map+PULLUPDN_OFFSET) = (*(gpio_map+PULLUPDN_OFFSET)&~3)|PUD_UP;
     else  // pud == PUD_OFF
        *(gpio_map+PULLUPDN_OFFSET) &= ~3;
     

data/ext/rpi_gpio/event_gpio.c

@@ -102,7 +102,8 @@ int gpio_set_direction(unsigned int gpio, unsigned int in_flag)
     int fd;
     char filename[33];
 
-    snprintf(filename, sizeof(filename), "/sys/class/gpio/gpio%d/direction", gpio);
+    snprintf(filename, sizeof(filename),
+      "/sys/class/gpio/gpio%d/direction", gpio);
     if ((fd = open(filename, O_WRONLY)) < 0)
         return -1;
 
@@ -527,12 +528,16 @@ int blocking_wait_for_edge(unsigned int gpio, unsigned int edge, int bouncetime)
             epoll_ctl(epfd_blocking, EPOLL_CTL_DEL, g->value_fd, &ev);
             return 2;
         }
-        if (g->initial_wait) {    // first time triggers with current state, so ignore
-            g->initial_wait = 0;
+        // first time triggers with current state, so ignore
+        if (g->initial_wait) {  
+          g->initial_wait = 0;
         } else {
             gettimeofday(&tv_timenow, NULL);
             timenow = tv_timenow.tv_sec*1E6 + tv_timenow.tv_usec;
-            if (g->bouncetime == -666 || timenow - g->lastcall > g->bouncetime*1000 || g->lastcall == 0 || g->lastcall > timenow) {
+            if (g->bouncetime == -666 ||
+            timenow - g->lastcall > g->bouncetime*1000 ||
+              g->lastcall == 0 ||
+              g->lastcall > timenow) {
                 g->lastcall = timenow;
                 finished = 1;
             }

data/ext/rpi_gpio/rb_gpio.c

@@ -33,15 +33,14 @@ void define_gpio_module_stuff(void)
 {
   int i;
 
-  rb_define_singleton_method(m_GPIO, "setup", GPIO_setup, 2);
-  rb_define_singleton_method(m_GPIO, "clean_up", GPIO_clean_up, -1);
-  rb_define_singleton_method(m_GPIO, "set_numbering", GPIO_set_numbering, 1);
-  rb_define_singleton_method(m_GPIO, "set_high", GPIO_set_high, 1);
-  rb_define_singleton_method(m_GPIO, "set_low", GPIO_set_low, 1);
-  rb_define_singleton_method(m_GPIO, "high?", GPIO_test_high, 1);
-  rb_define_singleton_method(m_GPIO, "low?", GPIO_test_low, 1);
-  rb_define_singleton_method(m_GPIO, "set_warnings", GPIO_set_warnings, 1);
-  define_constants(m_GPIO);
+  rb_define_module_function(m_GPIO, "setup", GPIO_setup, 2);
+  rb_define_module_function(m_GPIO, "clean_up", GPIO_clean_up, -1);
+  rb_define_module_function(m_GPIO, "set_numbering", GPIO_set_numbering, 1);
+  rb_define_module_function(m_GPIO, "set_high", GPIO_set_high, 1);
+  rb_define_module_function(m_GPIO, "set_low", GPIO_set_low, 1);
+  rb_define_module_function(m_GPIO, "high?", GPIO_test_high, 1);
+  rb_define_module_function(m_GPIO, "low?", GPIO_test_low, 1);
+  rb_define_module_function(m_GPIO, "set_warnings", GPIO_set_warnings, 1);
 
   for (i=0; i<54; i++)
     gpio_direction[i] = -1;
@@ -95,6 +94,51 @@ int mmap_gpio_mem(void)
    }
 }
 
+int is_gpio_input(unsigned int gpio)
+{
+  if (gpio_direction[gpio] != INPUT)
+  {
+    if (gpio_direction[gpio] != OUTPUT)
+    {
+      rb_raise(rb_eRuntimeError, "you must setup() the GPIO channel first");
+      return 0;
+    }
+
+    rb_raise(rb_eRuntimeError, "GPIO channel not setup as input");
+    return 0;
+  }
+
+  return 1;
+}
+
+int is_gpio_output(unsigned int gpio)
+{
+  if (gpio_direction[gpio] != OUTPUT)
+  {
+    if (gpio_direction[gpio] != INPUT)
+    {
+      rb_raise(rb_eRuntimeError, "you must setup() the GPIO channel first");
+      return 0;
+    }
+
+    rb_raise(rb_eRuntimeError, "GPIO channel not setup as output");
+    return 0;
+  }
+
+  return 1;
+}
+
+int is_rpi(void)
+{
+  if (setup_error)
+  {
+    rb_raise(rb_eRuntimeError, "this gem can only be run on a Raspberry Pi");
+    return 0;
+  }
+
+  return 1;
+}
+
 // RPi::GPIO.clean_up(channel=nil)
 // clean up everything by default; otherwise, clean up given channel
 VALUE GPIO_clean_up(int argc, VALUE *argv, VALUE self)
@@ -108,7 +152,8 @@ VALUE GPIO_clean_up(int argc, VALUE *argv, VALUE self)
       channel = NUM2INT(argv[0]);
    else if (argc > 1)
    {
-      rb_raise(rb_eArgError, "wrong number of arguments; 0 for all pins, 1 for a specific pin");
+      rb_raise(rb_eArgError, "wrong number of arguments; 0 for all pins, "
+        "1 for a specific pin");
       return Qnil;
    }
    
@@ -164,7 +209,7 @@ VALUE GPIO_setup(VALUE self, VALUE channel, VALUE hash)
   int direction;
   VALUE pud_val = Qnil;
   const char *pud_str = NULL;
-  int pud = PUD_OFF + PY_PUD_CONST_OFFSET;
+  int pud = PUD_OFF;
   int func;
   
   // func to set up channel stored in channel variable
@@ -215,11 +260,11 @@ VALUE GPIO_setup(VALUE self, VALUE channel, VALUE hash)
   
     pud_str = rb_id2name(rb_to_id(pud_val));
     if (strcmp("down", pud_str) == 0)
-      pud = PUD_DOWN + PY_PUD_CONST_OFFSET;
+      pud = PUD_DOWN;
     else if (strcmp("up", pud_str) == 0)
-      pud = PUD_UP + PY_PUD_CONST_OFFSET;
+      pud = PUD_UP;
     else if (strcmp("off", pud_str) == 0)
-      pud = PUD_OFF + PY_PUD_CONST_OFFSET;
+      pud = PUD_OFF;
     else
     {
       rb_raise(rb_eArgError, "invalid pin pull direction; must be :up, :down, "
@@ -228,16 +273,9 @@ VALUE GPIO_setup(VALUE self, VALUE channel, VALUE hash)
     }
   }
   else
-    pud = PUD_OFF + PY_PUD_CONST_OFFSET;
-
-  // check module has been imported cleanly
-  if (setup_error)
-  {
-    rb_raise(rb_eRuntimeError, "gem not imported correctly");
-    return Qnil;
-  }
+    pud = PUD_OFF;
 
-  if (mmap_gpio_mem())
+  if (!is_rpi() || mmap_gpio_mem())
     return Qnil;
 
   if (direction != INPUT && direction != OUTPUT)
@@ -247,8 +285,7 @@ VALUE GPIO_setup(VALUE self, VALUE channel, VALUE hash)
   }
 
   if (direction == OUTPUT)
-    pud = PUD_OFF + PY_PUD_CONST_OFFSET;
-  pud -= PY_PUD_CONST_OFFSET;
+    pud = PUD_OFF;
 
   if (!setup_one())
     return Qnil;
@@ -273,11 +310,8 @@ VALUE GPIO_set_numbering(VALUE self, VALUE mode)
   else
     rb_raise(rb_eArgError, "invalid numbering mode; must be :board or :bcm");
       
-  if (setup_error)
-  {
-    rb_raise(rb_eRuntimeError, "gem not imported correctly");
+  if (!is_rpi())
     return Qnil;
-  }
 
   if (gpio_mode != BOARD && gpio_mode != BCM)
   {
@@ -299,31 +333,14 @@ VALUE GPIO_set_numbering(VALUE self, VALUE mode)
 VALUE GPIO_set_high(VALUE self, VALUE channel)
 {
   unsigned int gpio;
-  int chan = -1;
+  int chan = NUM2INT(channel);
 
-  // func to output value var on channel var
-  int output(void)
-  {
-    if (get_gpio_number(chan, &gpio))
-      return 0;
-
-    if (gpio_direction[gpio] != OUTPUT)
-    {
-      rb_raise(rb_eRuntimeError, "GPIO channel not set as output");
-      return 0;
-    }
-
-    if (check_gpio_priv())
-      return 0;
-
-    output_gpio(gpio, 1);
-    return 1;
-  }
-
-  chan = NUM2INT(channel);
-  if (!output())
-    return Qnil;
+  if (get_gpio_number(chan, &gpio) ||
+    !is_gpio_output(gpio) ||
+    check_gpio_priv())
+  return Qnil;
 
+  output_gpio(gpio, 1);
   return self;
 }
 
@@ -331,31 +348,14 @@ VALUE GPIO_set_high(VALUE self, VALUE channel)
 VALUE GPIO_set_low(VALUE self, VALUE channel)
 {
   unsigned int gpio;
-  int chan = -1;
+  int chan = NUM2INT(channel);
 
-  // func to output value var on channel var
-  int output(void)
-  {
-    if (get_gpio_number(chan, &gpio))
-      return 0;
-
-    if (gpio_direction[gpio] != OUTPUT)
-    {
-      rb_raise(rb_eRuntimeError, "GPIO channel not set as output");
-      return 0;
-    }
-
-    if (check_gpio_priv())
-      return 0;
-
-    output_gpio(gpio, 0);
-    return 1;
-  }
-
-  chan = NUM2INT(channel);
-  if (!output())
-    return Qnil;
+  if (get_gpio_number(chan, &gpio) ||
+    !is_gpio_output(gpio) ||
+    check_gpio_priv())
+  return Qnil;
 
+  output_gpio(gpio, 0);
   return self;
 }
 
@@ -364,41 +364,25 @@ VALUE GPIO_test_high(VALUE self, VALUE channel)
 {
   unsigned int gpio;
   
-  if (get_gpio_number(NUM2INT(channel), &gpio))
+  if (get_gpio_number(NUM2INT(channel), &gpio) ||
+      !is_gpio_input(gpio) ||
+      check_gpio_priv())
     return Qnil;
-
-  if (gpio_direction[gpio] != INPUT && gpio_direction[gpio] != OUTPUT)
-  {
-    rb_raise(rb_eRuntimeError, "you must setup() the GPIO channel first");
-    return Qnil;
-  }
-
-  if (check_gpio_priv())
-    return Qnil;
-  
-  if (input_gpio(gpio))
-    return Qtrue;
-  else
-    return Qfalse;
+ 
+  return input_gpio(gpio) ? Qtrue : Qfalse;
 }
 
 // RPi::GPIO.low?(channel)
 VALUE GPIO_test_low(VALUE self, VALUE channel)
 {
-  VALUE val = GPIO_test_high(self, channel);
-  if (val == Qtrue) return Qfalse;
-  else if (val == Qfalse) return Qtrue;
-  else return Qnil;
+  return GPIO_test_high(self, channel) ? Qfalse : Qtrue;
 }
 
 // RPi::GPIO.set_warnings(state)
 VALUE GPIO_set_warnings(VALUE self, VALUE setting)
 {
-  if (setup_error)
-  {
-    rb_raise(rb_eRuntimeError, "gem not imported correctly");
+  if (!is_rpi())
     return Qnil;
-  }
 
   gpio_warnings = NUM2INT(setting);
   return self;

data/ext/rpi_gpio/rb_gpio.h

@@ -29,11 +29,13 @@ SOFTWARE.
 #include "event_gpio.h"
 #include "cpuinfo.h"
 #include "common.h"
-#include "constants.h"
 #include "rb_pwm.h"
 
 void define_gpio_module_stuff(void);
 int mmap_gpio_mem(void);
+int is_gpio_input(unsigned int gpio);
+int is_gpio_output(unsigned int gpio);
+int is_rpi(void);
 VALUE GPIO_clean_up(int argc, VALUE *argv, VALUE self);
 VALUE GPIO_setup(VALUE self, VALUE channel, VALUE hash);
 VALUE GPIO_set_numbering(VALUE self, VALUE mode);
@@ -42,3 +44,4 @@ VALUE GPIO_set_low(VALUE self, VALUE channel);
 VALUE GPIO_test_high(VALUE self, VALUE channel);
 VALUE GPIO_test_low(VALUE self, VALUE channel);
 VALUE GPIO_set_warnings(VALUE self, VALUE setting);
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpi_gpio
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Nick Lowery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -40,8 +40,6 @@ files:
 - ext/rpi_gpio/c_gpio.h
 - ext/rpi_gpio/common.c
 - ext/rpi_gpio/common.h
-- ext/rpi_gpio/constants.c
-- ext/rpi_gpio/constants.h
 - ext/rpi_gpio/cpuinfo.c
 - ext/rpi_gpio/cpuinfo.h
 - ext/rpi_gpio/event_gpio.c
@@ -55,7 +53,6 @@ files:
 - ext/rpi_gpio/rpi_gpio.h
 - ext/rpi_gpio/soft_pwm.c
 - ext/rpi_gpio/soft_pwm.h
-- lib/rpi_gpio.so
 homepage: https://github.com/ClockVapor/rpi_gpio
 licenses:
 - MIT

data/ext/rpi_gpio/constants.c

@@ -1,61 +0,0 @@
-/*
-Original code by Ben Croston modified for Ruby by Nick Lowery
-(github.com/clockvapor)
-Copyright (c) 2014-2015 Nick Lowery
-
-Copyright (c) 2013-2014 Ben Croston
-
-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 "ruby.h"
-#include "constants.h"
-#include "common.h"
-#include "c_gpio.h"
-#include "event_gpio.h"
-
-void define_constants(VALUE module)
-{   
-   pwm = INT2NUM(PWM);
-   rb_define_const(module, "HARD_PWM", pwm);
-   
-   serial = INT2NUM(SERIAL);
-   rb_define_const(module, "SERIAL", serial);
-   
-   i2c = INT2NUM(I2C);
-   rb_define_const(module, "I2C", i2c);
-   
-   spi = INT2NUM(SPI);
-   rb_define_const(module, "SPI", spi);
-
-   unknown = INT2NUM(MODE_UNKNOWN);
-   rb_define_const(module, "UNKNOWN", unknown);
-
-   rising_edge = INT2NUM(RISING_EDGE + PY_EVENT_CONST_OFFSET);
-   rb_define_const(module, "RISING", rising_edge);
-
-   falling_edge = INT2NUM(FALLING_EDGE + PY_EVENT_CONST_OFFSET);
-   rb_define_const(module, "FALLING", falling_edge);
-
-   both_edge = INT2NUM(BOTH_EDGE + PY_EVENT_CONST_OFFSET);
-   rb_define_const(module, "BOTH", both_edge);
-
-   version = rb_str_new2("0.5.8");
-   rb_define_const(module, "VERSION", version);
-}

data/ext/rpi_gpio/constants.h

@@ -1,40 +0,0 @@
-/*
-Original code by Ben Croston modified for Ruby by Nick Lowery
-(github.com/clockvapor)
-Copyright (c) 2014-2015 Nick Lowery
-
-Copyright (c) 2013-2014 Ben Croston
-
-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.
-*/
-
-#define PY_PUD_CONST_OFFSET 20
-#define PY_EVENT_CONST_OFFSET 30
-
-VALUE pwm;
-VALUE serial;
-VALUE i2c;
-VALUE spi;
-VALUE unknown;
-VALUE rising_edge;
-VALUE falling_edge;
-VALUE both_edge;
-VALUE version;
-
-void define_constants(VALUE module);