feat(rpi2-support): build-process and artifacts

updates the build-process to provide two independent bindings for the
old raspberry-pi (based on jgarff/rpi_ws281x) and the raspberry-pi 2
(based on the fork richardghirst/rpi_ws281x).

Author: Martin Schuhfuss

.gitmodules

@@ -1,3 +1,6 @@
-[submodule "src/rpi_ws281x"]
-	path = src/rpi_ws281x
+[submodule "src/rpi1_ws281x"]
+	path = src/rpi1_ws281x
+	url = git@github.com:jgarff/rpi_ws281x.git
+[submodule "src/rpi2_ws281x"]
+	path = src/rpi2_ws281x
 	url = git@github.com:richardghirst/rpi_ws281x.git

binding.gyp

@@ -5,20 +5,44 @@
       'targets': [
         {
           'target_name': 'rpi_ws281x',
-          'sources': ['./src/rpi-ws281x.cc'],
-          'dependencies': ['libws2811'],
+          'type': 'none',
+          'dependencies': ['rpi1_ws281x', 'rpi2_ws281x']
+        },
+
+        {
+          'target_name': 'rpi1_ws281x',
+          'sources': ['./src/rpi1-ws281x.cc'],
+          'dependencies': ['rpi1_libws2811'],
+          'include_dirs': ['<!(node -e "require(\'nan\')")']
+        },
+
+        {
+          'target_name': 'rpi2_ws281x',
+          'sources': ['./src/rpi2-ws281x.cc'],
+          'dependencies': ['rpi2_libws2811'],
           'include_dirs': ['<!(node -e "require(\'nan\')")']
         },
 
         {
-          'target_name': 'libws2811',
+          'target_name': 'rpi1_libws2811',
+          'type': 'static_library',
+          'sources': [
+            './src/rpi1_ws281x/ws2811.c',
+            './src/rpi1_ws281x/pwm.c',
+            './src/rpi1_ws281x/dma.c'
+          ],
+          'cflags': ['-O2', '-Wall']
+        },
+
+        {
+          'target_name': 'rpi2_libws2811',
           'type': 'static_library',
           'sources': [
-            './src/rpi_ws281x/ws2811.c',
-            './src/rpi_ws281x/pwm.c',
-            './src/rpi_ws281x/dma.c',
-            './src/rpi_ws281x/mailbox.c',
-            './src/rpi_ws281x/board_info.c'
+            './src/rpi2_ws281x/ws2811.c',
+            './src/rpi2_ws281x/pwm.c',
+            './src/rpi2_ws281x/dma.c',
+            './src/rpi2_ws281x/mailbox.c',
+            './src/rpi2_ws281x/board_info.c'
           ],
           'cflags': ['-O2', '-Wall']
         },
@@ -29,7 +53,10 @@
           'dependencies': ['rpi_ws281x'],
           'copies': [{
                        'destination': './lib/binding/',
-                       'files': ['<(PRODUCT_DIR)/rpi_ws281x.node']
+                       'files': [
+                         '<(PRODUCT_DIR)/rpi1_ws281x.node',
+                         '<(PRODUCT_DIR)/rpi2_ws281x.node'
+                       ]
                      }]
         }
       ]

lib/ws281x-native.js

@@ -6,15 +6,26 @@ function getNativeBindings() {
     // test for matches the raspberry-pi before loading the native-module
     if(process.arch === 'arm' || process.platform === 'linux') {
 
-        // will only work on the Broadcom BCM2709
-        var isBCM2708_9 = (function() {
-            var cpuInfo = require('fs').readFileSync('/proc/cpuinfo').toString();
-
-            return /hardware\s*:\s*bcm2708/i.test(cpuInfo) || /hardware\s*:\s*bcm2709/i.test(cpuInfo);
+        // will only work on RPi1 (Broadcom BCM2708) and RPi2 (BCM2709) and
+        // this is the best check i could come up with to see which one we are
+        // dealing with.
+        var raspberryVersion = (function() {
+            var cpuInfo = require('fs').readFileSync('/proc/cpuinfo').toString(),
+                socFamily = cpuInfo.match(/hardware\s*:\s*(bcm270[89])/i);
+
+            if(!socFamily) { return 0; }
+
+            switch(socFamily[1].toLowerCase()) {
+                case 'bcm2708': return 1;
+                case 'bcm2709': return 2;
+                default: return 0;
+            }
         } ());
 
-        if(isBCM2708_9) {
-            return require('./binding/rpi_ws281x.node');
+        if(raspberryVersion === 1) {
+            return require('./binding/rpi1_ws281x.node');
+        } else if(raspberryVersion === 2) {
+            return require('./binding/rpi2_ws281x.node');
         }
     }
 
@@ -27,8 +38,8 @@ var ws281xNative = getNativeBindings();
 if(!ws281xNative) {
     process.stderr.write(
         '[rpi-ws281x-native] it looks like you are not running the module ' +
-        'on a raspberry pi. Will only return stubs for native ' +
-        'interface-functions.\n'
+        'on a raspberry pi so there will be no functionality exposed by this ' +
+        'module. For convenience, stub-implementations are provided.\n'
     );
 
     ws281xNative = {

src/rpi-ws281x.cc renamed to src/rpi-ws281x-common.cc

@@ -9,7 +9,7 @@
 #include <algorithm>
 
 extern "C" {
-  #include "rpi_ws281x/ws2811.h"
+  #include "rpi1_ws281x/ws2811.h"
 }
 
 using namespace v8;
@@ -147,6 +147,4 @@ void initialize(Handle<Object> exports) {
   exports->Set(NanNew<String>("init"),   NanNew<FunctionTemplate>(Init)->GetFunction());
   exports->Set(NanNew<String>("reset"),  NanNew<FunctionTemplate>(Reset)->GetFunction());
   exports->Set(NanNew<String>("render"), NanNew<FunctionTemplate>(Render)->GetFunction());
-}
-
-NODE_MODULE(rpi_ws281x, initialize)
+}

src/rpi1-ws281x.cc

@@ -0,0 +1,6 @@
+#include <node.h>
+#include "rpi-ws281x-common.cc"
+
+using namespace v8;
+
+NODE_MODULE(rpi1_ws281x, initialize)

src/rpi_ws281x renamed to src/rpi1_ws281x

@@ -0,0 +1,6 @@
+#include <node.h>
+#include "rpi-ws281x-common.cc"
+
+using namespace v8;
+
+NODE_MODULE(rpi2_ws281x, initialize)