rpi_gpio 0.2.0 → 0.4.0

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.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nick Lowery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -50,21 +50,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- ext/new/c_gpio.c
-- ext/new/c_gpio.h
-- ext/new/common.c
-- ext/new/common.h
-- ext/new/constants.c
-- ext/new/constants.h
-- ext/new/cpuinfo.c
-- ext/new/cpuinfo.h
-- ext/new/event_gpio.c
-- ext/new/event_gpio.h
-- ext/new/py_gpio.c
-- ext/new/py_pwm.c
-- ext/new/py_pwm.h
-- ext/new/soft_pwm.c
-- ext/new/soft_pwm.h
 - ext/rpi_gpio/c_gpio.c
 - ext/rpi_gpio/c_gpio.h
 - ext/rpi_gpio/common.c
@@ -82,7 +67,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
@@ -102,8 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby conversion of RPi.GPIO Python module

data/ext/new/c_gpio.c

@@ -1,237 +0,0 @@
-/*
-Copyright (c) 2012-2015 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 <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include "c_gpio.h"
-
-#define BCM2708_PERI_BASE_DEFAULT   0x20000000
-#define GPIO_BASE_OFFSET            0x200000
-#define FSEL_OFFSET                 0   // 0x0000
-#define SET_OFFSET                  7   // 0x001c / 4
-#define CLR_OFFSET                  10  // 0x0028 / 4
-#define PINLEVEL_OFFSET             13  // 0x0034 / 4
-#define EVENT_DETECT_OFFSET         16  // 0x0040 / 4
-#define RISING_ED_OFFSET            19  // 0x004c / 4
-#define FALLING_ED_OFFSET           22  // 0x0058 / 4
-#define HIGH_DETECT_OFFSET          25  // 0x0064 / 4
-#define LOW_DETECT_OFFSET           28  // 0x0070 / 4
-#define PULLUPDN_OFFSET             37  // 0x0094 / 4
-#define PULLUPDNCLK_OFFSET          38  // 0x0098 / 4
-
-#define PAGE_SIZE  (4*1024)
-#define BLOCK_SIZE (4*1024)
-
-static volatile uint32_t *gpio_map;
-
-void short_wait(void)
-{
-    int i;
-
-    for (i=0; i<150; i++) {    // wait 150 cycles
-        asm volatile("nop");
-    }
-}
-
-int setup(void)
-{
-    int mem_fd;
-    uint8_t *gpio_mem;
-    uint32_t peri_base = BCM2708_PERI_BASE_DEFAULT;
-    uint32_t gpio_base; 
-    unsigned char buf[4];
-    FILE *fp;
-
-    // get peri base from device tree
-    if ((fp = fopen("/proc/device-tree/soc/ranges", "rb")) != NULL) {
-        fseek(fp, 4, SEEK_SET);
-        if (fread(buf, 1, sizeof buf, fp) == sizeof buf) {
-            peri_base = buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3] << 0;
-        }
-        fclose(fp);
-    }
-
-    gpio_base = peri_base + GPIO_BASE_OFFSET;
-
-    // mmap the GPIO memory registers
-    if ((mem_fd = open("/dev/mem", O_RDWR|O_SYNC) ) < 0)
-        return SETUP_DEVMEM_FAIL;
-
-    if ((gpio_mem = malloc(BLOCK_SIZE + (PAGE_SIZE-1))) == NULL)
-        return SETUP_MALLOC_FAIL;
-
-    if ((uint32_t)gpio_mem % PAGE_SIZE)
-        gpio_mem += PAGE_SIZE - ((uint32_t)gpio_mem % PAGE_SIZE);
-
-    gpio_map = (uint32_t *)mmap( (caddr_t)gpio_mem, BLOCK_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_FIXED, mem_fd, gpio_base);
-
-    if ((uint32_t)gpio_map < 0)
-        return SETUP_MMAP_FAIL;
-
-    return SETUP_OK;
-}
-
-void clear_event_detect(int gpio)
-{
-    int offset = EVENT_DETECT_OFFSET + (gpio/32);
-    int shift = (gpio%32);
-
-    *(gpio_map+offset) |= (1 << shift);
-    short_wait();
-    *(gpio_map+offset) = 0;
-}
-
-int eventdetected(int gpio)
-{
-    int offset, value, bit;
-
-    offset = EVENT_DETECT_OFFSET + (gpio/32);
-    bit = (1 << (gpio%32));
-    value = *(gpio_map+offset) & bit;
-    if (value)
-        clear_event_detect(gpio);
-    return value;
-}
-
-void set_rising_event(int gpio, int enable)
-{
-    int offset = RISING_ED_OFFSET + (gpio/32);
-    int shift = (gpio%32);
-
-    if (enable)
-        *(gpio_map+offset) |= 1 << shift;
-    else
-        *(gpio_map+offset) &= ~(1 << shift);
-    clear_event_detect(gpio);
-}
-
-void set_falling_event(int gpio, int enable)
-{
-    int offset = FALLING_ED_OFFSET + (gpio/32);
-    int shift = (gpio%32);
-
-    if (enable) {
-        *(gpio_map+offset) |= (1 << shift);
-        *(gpio_map+offset) = (1 << shift);
-    } else {
-        *(gpio_map+offset) &= ~(1 << shift);
-    }
-    clear_event_detect(gpio);
-}
-
-void set_high_event(int gpio, int enable)
-{
-    int offset = HIGH_DETECT_OFFSET + (gpio/32);
-    int shift = (gpio%32);
-
-    if (enable)
-        *(gpio_map+offset) |= (1 << shift);
-    else
-        *(gpio_map+offset) &= ~(1 << shift);
-    clear_event_detect(gpio);
-}
-
-void set_low_event(int gpio, int enable)
-{
-    int offset = LOW_DETECT_OFFSET + (gpio/32);
-    int shift = (gpio%32);
-
-    if (enable)
-        *(gpio_map+offset) |= 1 << shift;
-    else
-        *(gpio_map+offset) &= ~(1 << shift);
-    clear_event_detect(gpio);
-}
-
-void set_pullupdn(int gpio, int pud)
-{
-    int clk_offset = PULLUPDNCLK_OFFSET + (gpio/32);
-    int shift = (gpio%32);
-
-    if (pud == 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;
-    else  // pud == PUD_OFF
-        *(gpio_map+PULLUPDN_OFFSET) &= ~3;
-
-    short_wait();
-    *(gpio_map+clk_offset) = 1 << shift;
-    short_wait();
-    *(gpio_map+PULLUPDN_OFFSET) &= ~3;
-    *(gpio_map+clk_offset) = 0;
-}
-
-void setup_gpio(int gpio, int direction, int pud)
-{
-    int offset = FSEL_OFFSET + (gpio/10);
-    int shift = (gpio%10)*3;
-
-    set_pullupdn(gpio, pud);
-    if (direction == OUTPUT)
-        *(gpio_map+offset) = (*(gpio_map+offset) & ~(7<<shift)) | (1<<shift);
-    else  // direction == INPUT
-        *(gpio_map+offset) = (*(gpio_map+offset) & ~(7<<shift));
-}
-
-// Contribution by Eric Ptak <trouch@trouch.com>
-int gpio_function(int gpio)
-{
-    int offset = FSEL_OFFSET + (gpio/10);
-    int shift = (gpio%10)*3;
-    int value = *(gpio_map+offset);
-    value >>= shift;
-    value &= 7;
-    return value; // 0=input, 1=output, 4=alt0
-}
-
-void output_gpio(int gpio, int value)
-{
-    int offset, shift;
-
-    if (value) // value == HIGH
-        offset = SET_OFFSET + (gpio/32);
-    else       // value == LOW
-       offset = CLR_OFFSET + (gpio/32);
-
-    shift = (gpio%32);
-
-    *(gpio_map+offset) = 1 << shift;
-}
-
-int input_gpio(int gpio)
-{
-   int offset, value, mask;
-
-   offset = PINLEVEL_OFFSET + (gpio/32);
-   mask = (1 << gpio%32);
-   value = *(gpio_map+offset) & mask;
-   return value;
-}
-
-void cleanup(void)
-{
-    munmap((caddr_t)gpio_map, BLOCK_SIZE);
-}

data/ext/new/c_gpio.h

@@ -1,49 +0,0 @@
-/*
-Copyright (c) 2012-2013 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.
-*/
-
-int setup(void);
-void setup_gpio(int gpio, int direction, int pud);
-int gpio_function(int gpio);
-void output_gpio(int gpio, int value);
-int input_gpio(int gpio);
-void set_rising_event(int gpio, int enable);
-void set_falling_event(int gpio, int enable);
-void set_high_event(int gpio, int enable);
-void set_low_event(int gpio, int enable);
-int eventdetected(int gpio);
-void cleanup(void);
-
-#define SETUP_OK          0
-#define SETUP_DEVMEM_FAIL 1
-#define SETUP_MALLOC_FAIL 2
-#define SETUP_MMAP_FAIL   3
-
-#define INPUT  1 // is really 0 for control register!
-#define OUTPUT 0 // is really 1 for control register!
-#define ALT0   4
-
-#define HIGH 1
-#define LOW  0
-
-#define PUD_OFF  0
-#define PUD_DOWN 1
-#define PUD_UP   2

data/ext/new/common.c

@@ -1,87 +0,0 @@
-/*
-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 "Python.h"
-#include "c_gpio.h"
-#include "common.h"
-
-int gpio_mode = MODE_UNKNOWN;
-const int pin_to_gpio_rev1[41] = {-1, -1, -1, 0, -1, 1, -1, 4, 14, -1, 15, 17, 18, 21, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
-const int pin_to_gpio_rev2[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
-const int pin_to_gpio_rev3[41] = {-1, -1, -1, 2, -1, 3, -1, 4, 14, -1, 15, 17, 18, 27, -1, 22, 23, -1, 24, 10, -1, 9, 25, 11, 8, -1, 7, -1, -1, 5, -1, 6, 12, 13, -1, 19, 16, 26, 20, -1, 21 };
-int setup_error = 0;
-int module_setup = 0;
-
-int check_gpio_priv(void)
-{
-    // check module has been imported cleanly
-    if (setup_error)
-    {
-        PyErr_SetString(PyExc_RuntimeError, "Module not imported correctly!");
-        return 1;
-    }
-
-    // check mmap setup has worked
-    if (!module_setup)
-    {
-        PyErr_SetString(PyExc_RuntimeError, "No access to /dev/mem.  Try running as root!");
-        return 2;
-    }
-    return 0;
-}
-
-int get_gpio_number(int channel, unsigned int *gpio)
-{
-    // check setmode() has been run
-    if (gpio_mode != BOARD && gpio_mode != BCM)
-    {
-        PyErr_SetString(PyExc_RuntimeError, "Please set pin numbering mode using GPIO.setmode(GPIO.BOARD) or GPIO.setmode(GPIO.BCM)");
-        return 3;
-    }
-
-    // check channel number is in range
-    if ( (gpio_mode == BCM && (channel < 0 || channel > 53))
-      || (gpio_mode == BOARD && (channel < 1 || channel > 26) && rpiinfo.p1_revision != 3)
-      || (gpio_mode == BOARD && (channel < 1 || channel > 40) && rpiinfo.p1_revision == 3) )
-    {
-        PyErr_SetString(PyExc_ValueError, "The channel sent is invalid on a Raspberry Pi");
-        return 4;
-    }
-
-    // convert channel to gpio
-    if (gpio_mode == BOARD)
-    {
-        if (*(*pin_to_gpio+channel) == -1)
-        {
-            PyErr_SetString(PyExc_ValueError, "The channel sent is invalid on a Raspberry Pi");
-            return 5;
-        } else {
-            *gpio = *(*pin_to_gpio+channel);
-        }
-    }
-    else // gpio_mode == BCM
-    {
-        *gpio = channel;
-    }
-
-    return 0;
-}