GPIO able to be controlled by pin sysfs number like RPi.GPIO, close #65

Author: xtacocorex

CHANGELOG.rst

@@ -1,3 +1,7 @@
+0.7.0
+---
+* Added ability to specify GPIO only as a number, this doesn't work for PWM/SPWM/LRADC/SERVO
+
 0.6.2
 ---
 * Implementation for #77 - ability to push up binary pypi

Makefile

@@ -4,8 +4,13 @@ package: clean
 	python setup.py sdist bdist_wheel
 	python3 setup.py bdist_wheel
 
+# PyPi Packaging
+package3: package
+	@echo " ** PACKAGING FOR PYPI **"
+	python3 setup.py bdist_wheel
+
 # PyPi Publishing
-publish: package
+publish: package package3
 	@echo " ** UPLOADING TO PYPI **"
 	twine upload dist/*
 

debian/changelog

@@ -1,7 +1,13 @@
+chip-io (0.7.0-1) unstable; urgency=low
+
+ * Added ability to specify GPIO only as a number, this doesn't work for PWM/SPWM/LRADC/SERVO
+
+ -- Robert Wolterman <[email protected]>  Wed, 13 Sep 2017 09:51:00 -0600
+
 chip-io (0.6.2-1) unstable; urgency=low
 
- * Implementation for #77 - ability to push up binary pypi
- * Implementation for #75 - wait_for_edge timeout
+ * Implementation for number 77 ability to push up binary pypi
+ * Implementation for number 75 wait for edge timeout
 
  -- Robert Wolterman <[email protected]>  Sun, 03 Sep 2017 21:34:00 -0600
 

debian/files

@@ -1,2 +1,2 @@
-python-chip-io_0.6.1-1_armhf.deb python optional
-python3-chip-io_0.6.1-1_armhf.deb python optional
+python-chip-io_0.7.0-1_armhf.deb python optional
+python3-chip-io_0.7.0-1_armhf.deb python optional

setup.py

@@ -13,7 +13,7 @@
                'Topic :: System :: Hardware']
 
 setup(name             = 'CHIP_IO',
-      version          = '0.6.2',
+      version          = '0.7.0',
       author           = 'Robert Wolterman',
       author_email     = '[email protected]',
       description      = 'A module to control CHIP IO channels',

source/common.c

@@ -371,6 +371,28 @@ int gpio_pud_capable(pins_t *pin)
   return capable;
 }
 
+int lookup_gpio_by_number(const char *num) {
+  // Convert the char to an int
+  char *ptr;
+  long ret;
+  int gpnum;
+  ret = strtol(num, &ptr, 10);
+  if (ret == 0) {
+    return -1;
+  }
+  // If we make it here, lets look for the data
+  pins_t *p;
+  for (p = pins_info; p->key != NULL; ++p) {
+      gpnum = gpio_number(p);
+      // If the number of the gpio pin matches the input
+      // we are 
+      if (gpnum == (int)ret) {
+          return gpnum;
+      }
+  }
+  return -1;
+}
+
 int lookup_gpio_by_key(const char *key)
 {
   pins_t *p;
@@ -541,10 +563,13 @@ int get_gpio_number(const char *key, int *gpio)
     if (*gpio <= 0) {
         *gpio = lookup_gpio_by_name(key);
         if (*gpio <= 0) {
-             *gpio = lookup_gpio_by_altname(key);
-             if (*gpio <=0) {
-                 status = -1;  /* error */
-             }
+            *gpio = lookup_gpio_by_altname(key);
+            if (*gpio <=0) {
+                *gpio = lookup_gpio_by_number(key);
+                if (*gpio <= 0) {
+                    status = -1;  /* error */
+                 }
+            }
         }
     }
     return status;

source/common.h

@@ -94,6 +94,7 @@ int get_xio_base(void);
 int is_this_chippro(void);
 int gpio_number(pins_t *pin);
 int gpio_pud_capable(pins_t *pin);
+int lookup_gpio_by_number(const char *num);
 int lookup_gpio_by_key(const char *key);
 int lookup_gpio_by_name(const char *name);
 int lookup_gpio_by_altname(const char *altname);

source/constants.c

@@ -85,6 +85,6 @@ void define_constants(PyObject *module)
    bcm = Py_BuildValue("i", BCM);
    PyModule_AddObject(module, "BCM", bcm);
 
-   version = Py_BuildValue("s", "0.6.2");
+   version = Py_BuildValue("s", "0.7");
    PyModule_AddObject(module, "VERSION", version);
 }