rpi_gpio 0.3.3 → 0.4.0

data/ext/rpi_gpio/rb_gpio.h

@@ -1,48 +1,47 @@
-/*
-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 "c_gpio.h"
-#include "event_gpio.h"
-#include "cpuinfo.h"
-#include "common.h"
-#include "rb_pwm.h"
-
-void define_gpio_module_stuff(void);
-int mmap_gpio_mem(void);
-int is_gpio_initialized(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_reset(VALUE self);
-VALUE GPIO_setup(VALUE self, VALUE channel, VALUE hash);
-VALUE GPIO_set_numbering(VALUE self, VALUE mode);
-VALUE GPIO_set_high(VALUE self, VALUE channel);
-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);
-
+/*
+Original code by Ben Croston modified for Ruby by Nick Lowery
+(github.com/clockvapor)
+Copyright (c) 2014-2020 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 "c_gpio.h"
+#include "event_gpio.h"
+#include "cpuinfo.h"
+#include "common.h"
+#include "rb_pwm.h"
+
+void define_gpio_module_stuff(void);
+int mmap_gpio_mem(void);
+int is_gpio_initialized(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_reset(VALUE self);
+VALUE GPIO_setup(VALUE self, VALUE channel, VALUE hash);
+VALUE GPIO_set_numbering(VALUE self, VALUE mode);
+VALUE GPIO_set_high(VALUE self, VALUE channel);
+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);

data/ext/rpi_gpio/rb_pwm.c

@@ -1,9 +1,9 @@
 /*
 Original code by Ben Croston modified for Ruby by Nick Lowery
 (github.com/clockvapor)
-Copyright (c) 2014-2015 Nick Lowery
+Copyright (c) 2014-2020 Nick Lowery
 
-Copyright (c) 2013-2014 Ben Croston
+Copyright (c) 2013-2018 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
@@ -54,13 +54,20 @@ VALUE PWM_initialize(VALUE self, VALUE channel, VALUE frequency)
   // convert channel to gpio
   if (get_gpio_number(chan, &gpio))
     return Qnil;
+ 
+  // does soft pwm already exist on this channel?
+  if (pwm_exists(gpio))
+  {
+    rb_raise(rb_eRuntimeError, "a PWM object already exists for this GPIO channel");
+    return Qnil;
+  }
   
   // ensure channel is set as output
   if (gpio_direction[gpio] != OUTPUT)
   {
     rb_raise(rb_eRuntimeError, "you must setup the GPIO channel as output "
       "first with RPi::GPIO.setup CHANNEL, :as => :output");
-      return Qnil;
+    return Qnil;
   }
   
   rb_iv_set(self, "@gpio", UINT2NUM(gpio));

data/ext/rpi_gpio/soft_pwm.c

@@ -1,9 +1,9 @@
 /*
 Original code by Ben Croston modified for Ruby by Nick Lowery
 (github.com/clockvapor)
-Copyright (c) 2014-2015 Nick Lowery
+Copyright (c) 2014-2020 Nick Lowery
 
-Copyright (c) 2013-2014 Ben Croston
+Copyright (c) 2013-2018 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
@@ -54,13 +54,14 @@ void remove_pwm(unsigned int gpio)
     {
         if (p->gpio == gpio)
         {
-            if (prev == NULL)
+            if (prev == NULL) {
                 pwm_list = p->next;
-            else
+            } else {
                 prev->next = p->next;
+            }
             temp = p;
             p = p->next;
-            free(temp);
+            temp->running = 0; // signal the thread to stop. The thread will free() the pwm struct when it's done with it.
         } else {
             prev = p;
             p = p->next;
@@ -113,7 +114,7 @@ void *pwm_thread(void *threadarg)
 
     // clean up
     output_gpio(p->gpio, 0);
-    remove_pwm(p->gpio);
+    free(p);
     pthread_exit(NULL);
 }
 
@@ -135,6 +136,7 @@ struct pwm *add_new_pwm(unsigned int gpio)
 }
 
 struct pwm *find_pwm(unsigned int gpio)
+/* Return the pwm record for gpio, creating it if it does not exist */
 {
     struct pwm *p = pwm_list;
 
@@ -207,12 +209,27 @@ void pwm_start(unsigned int gpio)
         p->running = 0;
         return;
     }
+    pthread_detach(threads);
 }
 
 void pwm_stop(unsigned int gpio)
 {
-    struct pwm *p;
+    remove_pwm(gpio);
+}
 
-    if ((p = find_pwm(gpio)) != NULL)
-        p->running = 0;
+// returns 1 if there is a PWM for this gpio, 0 otherwise
+int pwm_exists(unsigned int gpio)
+{
+    struct pwm *p = pwm_list;
+
+    while (p != NULL)
+    {
+        if (p->gpio == gpio)
+        {
+            return 1;
+        } else {
+            p = p->next;
+        }
+    }
+    return 0;
 }

data/ext/rpi_gpio/soft_pwm.h

@@ -1,9 +1,9 @@
 /*
 Original code by Ben Croston modified for Ruby by Nick Lowery
 (github.com/clockvapor)
-Copyright (c) 2014-2015 Nick Lowery
+Copyright (c) 2014-2020 Nick Lowery
 
-Copyright (c) 2013-2014 Ben Croston
+Copyright (c) 2013-2018 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
@@ -30,3 +30,4 @@ void pwm_set_duty_cycle(unsigned int gpio, float dutycycle);
 void pwm_set_frequency(unsigned int gpio, float freq);
 void pwm_start(unsigned int gpio);
 void pwm_stop(unsigned int gpio);
+int pwm_exists(unsigned int gpio);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpi_gpio
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Nick Lowery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -86,8 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby conversion of RPi.GPIO Python module