Merge branch 'master' of github.com:rwaldron/johnny-five into 828

* 'master' of github.com:rwaldron/johnny-five: Update list of contributors—thanks to all these rad folks <3 LCD: adjust pins to match comments Build examples LCD: adjust pins to match comments
rwaldron · Jul 7, 2015 · 64784f1 · 64784f1
2 parents a60e986 + 2593dd6
commit 64784f1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/docs/lcd.md b/docs/lcd.md
@@ -39,8 +39,8 @@ board.on("ready", function() {
   lcd = new five.LCD({
     // LCD pin name  RS  EN  DB4 DB5 DB6 DB7
     // Arduino pin # 7    8   9   10  11  12
-    pins: [8, 9, 4, 5, 6, 7],
-    backlight: 10,
+    pins: [7, 8, 9, 10, 11, 12],
+    backlight: 6,
     rows: 2,
     cols: 20
 

diff --git a/eg/lcd.js b/eg/lcd.js
@@ -8,8 +8,8 @@ board.on("ready", function() {
   lcd = new five.LCD({
     // LCD pin name  RS  EN  DB4 DB5 DB6 DB7
     // Arduino pin # 7    8   9   10  11  12
-    pins: [8, 9, 4, 5, 6, 7],
-    backlight: 10,
+    pins: [7, 8, 9, 10, 11, 12],
+    backlight: 6,
     rows: 2,
     cols: 20
 

diff --git a/package.json b/package.json
@@ -83,7 +83,10 @@
     { "name": "Dany Shaanan", "email": "<danyshaanan@gmail.com>" },
     { "name": "Rachel Hazes", "email": "<>" },
     { "name": "DeShawn Williams", "email": "<deshawn.b.williams@gmail.com>" },
-    { "name": "bartmichu", "email": "<>" }
+    { "name": "bartmichu", "email": "<>" },
+    { "name": "Steve Kinney", "email": "<hello@stevekinney.net>" },
+    { "name": "H. Phil Duby", "email": "<philduby@phriendly.net>" },
+    { "name": "Vincent Rubiolo", "email": "<vincent.libre@cryostase.eu>" }
   ],
   "keywords": [
     "arduino", "raspberrypi", "usb", "serial", "serialport", "firmata", "robot", "spark", "spark core", "spark-io", "spark", "particle", "i2c", "raspberrypi", "raspberry pi", "rpi", "raspi-io", "intel galileo", "galileo", "galileo-io", "intel edison", "edison", "pcduino"