v2.0.0-beta1: Merged changes from Andy Baker and Reik Hua for compati…

…bility with Pi 0, 2 and 3

README.rst

@@ -55,9 +55,26 @@ License
     <http://www.gnu.org/licenses/lgpl-3.0-standalone.html>
 
 
+Building for Development
+------------------------
+
+On the Raspberry Pi:
+
+    sudo apt-get install python-dev python3 python3.2-dev
+
+On the developer machine::
+
+    fab upload
+    fab build_gpio
+    fab build_pwm
+
+
 Special Thanks
 --------------
 
+    Andy Baker and Reik Hua for supplying compatibility updates for the
+    Raspberry Pi 0, 2 and 3.
+
     `csegit <https://github.com/csegit>`_, `waveform80 <https://github.com/waveform80>`_,
     `nils-werner <https://github.com/nils-werner>`_, `friedcell <https://github.com/friedcell>`_,
     `zejn <https://github.com/zejn>`_, `dbeal <https://github.com/dbeal>`_,

VERSION

@@ -1 +1 @@
-0.10.1
+2.0.0-beta1

debian/changelog

@@ -1,3 +1,9 @@
+rpio (2.0.0-beta1) unstable; urgency=low
+
+  * Support for Raspberry Pi 0, 2, 3 (thanks to Andy Baker and Reik Hua)
+
+ -- Chris Hager <[email protected]>  Thu, 02 Jun 2016 21:32:58 +0100
+
 rpio (0.10.1) unstable; urgency=low
 
   * Updated debian/control Standards-Version to 3.9.3.1

documentation/source/conf.py

@@ -48,7 +48,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.10.1'
+version = '2.0.0-beta1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

documentation/source/index.rst

@@ -31,6 +31,7 @@ Documentation
 News
 ----
 
+* v2.0.0-beta1: RPIO works with Raspberry Pi Zero, 2 and 3 (Thanks to Andy Baker and Reik Hua)
 * v0.9.2: :ref:`PWM via DMA <ref-rpio-pwm-py>`
 * v0.8.4: ``rpio-curses``
 * v0.8.2: Socket server callbacks with :ref:`RPIO.add_tcp_callback(port, callback, threaded_callback=False) <ref-rpio-py>`
@@ -113,6 +114,10 @@ License & Copyright
 Changes
 -------
 
+* v2.0.0-beta1
+
+  * RPIO works with Raspberry Pi Zero, 2 and 3 (Thanks to Andy Baker and Reik Hua)
+
 * v0.11.0
 
   * Merged various pull requests: Arch package link, bugfixes, allow Pi to control
@@ -157,9 +162,9 @@ Changes
 * v0.8.2
 
   * Added TCP socket callbacks
-  * ``RPIO`` does not auto-clean interfaces on exceptions anymore, but will auto-clean them 
+  * ``RPIO`` does not auto-clean interfaces on exceptions anymore, but will auto-clean them
     as needed. This means you should now call ``RPIO.cleanup_interrupts()`` to properly close
-    the sockets and unexport the interfaces. 
+    the sockets and unexport the interfaces.
   * Renamed ``RPIO.rpi_sysinfo()`` to ``RPIO.sysinfo()``
 
 
@@ -176,7 +181,7 @@ Changes
 
 
 * v0.7.1
-  
+
   * Refactoring and cleanup of c_gpio
   * Added new constants and methods (see documentation above)
   * Bugfixes

fabfile.py

@@ -14,7 +14,8 @@
 
 # Set default hosts
 if not env.hosts:
-    env.hosts = ["raspberry_dev_local"]
+    # env.hosts = ["raspberry_dev_local"]
+    env.hosts = ["omxdev"]
 
 
 def _get_cur_version():

setup.py

@@ -8,14 +8,14 @@ def read(fname):
 
 setup(
     name="RPIO",
-    version="0.10.1",
+    version="2.0.0-beta1",
     package_dir={"": "source"},
     packages=['RPIO', 'RPIO.PWM'],
     ext_modules=[
             Extension('RPIO._GPIO', ['source/c_gpio/py_gpio.c',
                 'source/c_gpio/c_gpio.c', 'source/c_gpio/cpuinfo.c'],
                 extra_compile_args=["-Wno-error=declaration-after-statement"]),
-            Extension('RPIO.PWM._PWM', ['source/c_pwm/pwm.c',
+            Extension('RPIO.PWM._PWM', ['source/c_pwm/pwm.c', 'source/c_pwm/mailbox.c',
                 'source/c_pwm/pwm_py.c'],
                 extra_compile_args=["-Wno-error=declaration-after-statement"])],
     scripts=["source/scripts/rpio", "source/scripts/rpio-curses"],

source/RPIO/PWM/__init__.py

@@ -206,7 +206,7 @@ def set_servo(self, gpio, pulse_width_us):
             if _subcycle_us != self._subcycle_time_us:
                 raise AttributeError(("Error: DMA channel %s is setup with a "
                         "subcycle_time of %sus (instead of %sus)") % \
-                        (self._dma_channel, _subcycle_us, 
+                        (self._dma_channel, _subcycle_us,
                             self._subcycle_time_us))
         else:
             init_channel(self._dma_channel, self._subcycle_time_us)

source/RPIO/__init__.py

@@ -116,7 +116,7 @@ def socket_callback(socket, val):
 from RPIO._RPIO import Interruptor
 
 
-VERSION = "0.10.1"
+VERSION = "2.0.0-beta1"
 
 # Exposing constants from RPi.GPIO
 VERSION_GPIO = _GPIO.VERSION_GPIO
@@ -266,7 +266,7 @@ def cleanup_interrupts():
     """
     Removes all callbacks and closes used GPIO interfaces and sockets. After
     this you'll need to re-add the interrupt callbacks before waiting for
-    interrupts again. Since RPIO v0.10.1 this is done automatically on exit.
+    interrupts again. Since RPIO v2.0.0-beta1 this is done automatically on exit.
     """
     _rpio.cleanup_interrupts()
 

source/c_gpio/c_gpio.c

@@ -79,7 +79,7 @@ setup(void)
     if ((uint32_t)gpio_mem % PAGE_SIZE)
         gpio_mem += PAGE_SIZE - ((uint32_t)gpio_mem % PAGE_SIZE);
 
-    gpio_map = (uint32_t *)mmap( (void *)gpio_mem, BLOCK_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_FIXED, mem_fd, GPIO_BASE);
+    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;
@@ -163,5 +163,5 @@ void
 cleanup(void)
 {
     // fixme - set all gpios back to input
-    munmap((void *)gpio_map, BLOCK_SIZE);
+    munmap((caddr_t)gpio_map, BLOCK_SIZE);
 }

source/c_gpio/cpuinfo.c

@@ -35,7 +35,7 @@
 // revision_hex will be four characters revision id (eg. '0004'),
 // the over-voltage header, if present, is removed (since it is
 // not consistently present on all overclocked boards).
-int 
+int
 get_cpuinfo_revision(char *revision_hex)
 {
     FILE *fp;
@@ -49,7 +49,11 @@ get_cpuinfo_revision(char *revision_hex)
     while(!feof(fp)) {
         fgets(buffer, sizeof(buffer) , fp);
         sscanf(buffer, "Hardware	: %s", hardware);
-        if (strcmp(hardware, "BCM2708") == 0)
+        if (strcmp(hardware, "BCM2708") == 0||
+            strcmp(hardware, "BCM2709") == 0||
+            strcmp(hardware, "BCM2835") == 0||
+            strcmp(hardware, "BCM2836") == 0
+           )
             rpi_found = 1;
         sscanf(buffer, "Revision	: %s", revision_hex);
     }

source/c_gpio/py_gpio.c

@@ -23,7 +23,7 @@
  *     http://pythonhosted.org/RPIO
  *
  * py_gpio.c is based on RPi.GPIO by Ben Croston, and provides a Python interface to
- * interact with the gpio-related C methods. 
+ * interact with the gpio-related C methods.
  */
 #include "Python.h"
 #include "c_gpio.h"
@@ -547,7 +547,7 @@ PyMODINIT_FUNC init_GPIO(void)
     rpi_revision_hex = Py_BuildValue("s", revision_hex);
     PyModule_AddObject(module, "RPI_REVISION_HEX", rpi_revision_hex);
 
-    version = Py_BuildValue("s", "0.10.1/0.4.2a");
+    version = Py_BuildValue("s", "2.0.0-beta1/0.4.2a");
     PyModule_AddObject(module, "VERSION_GPIO", version);
 
     // set up mmaped areas

source/c_pwm/Makefile

@@ -5,21 +5,24 @@ pwm:
 
 py2.6:
 	mkdir -p build
+	gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python2.6 -c mailbox.c -o build/mailbox.o
 	gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python2.6 -c pwm.c -o build/pwm.o
 	gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python2.6 -c pwm_py.c -o build/pwm_py.o
-	gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-z,relro build/pwm.o build/pwm_py.o -o _PWM.so
+	gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-z,relro build/mailbox.o build/pwm.o build/pwm_py.o -o _PWM.so
 	rm -rf build
 
 py2.7:
 	mkdir -p build
+	gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c mailbox.c -o build/mailbox.o
 	gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c pwm.c -o build/pwm.o
 	gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c pwm_py.c -o build/pwm_py.o
-	gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-z,relro build/pwm.o build/pwm_py.o -o _PWM.so
+	gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-z,relro build/mailbox.o build/pwm.o build/pwm_py.o -o _PWM.so
 	rm -rf build
 
 py3.2:
 	mkdir -p build
+	gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python3.2mu -c mailbox.c -o build/mailbox.o
 	gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python3.2mu -c pwm.c -o build/pwm.o
 	gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python3.2mu -c pwm_py.c -o build/pwm_py.o
-	gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-z,relro build/pwm.o build/pwm_py.o -o _PWM.so
+	gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-z,relro build/mailbox.o build/pwm.o build/pwm_py.o -o _PWM.so
 	rm -rf build