Keypad: refactor

rwaldron · Jul 3, 2015 · 2dc685e · 2dc685e
1 parent c572930
commit 2dc685e
Show file tree

Hide file tree

Showing 7 changed files with 215 additions and 212 deletions.
diff --git a/eg/keypad-MPR121.js b/eg/keypad-MPR121.js
@@ -9,15 +9,13 @@ board.on("ready", function() {
 
   if (argv.show === 1) {
     keypad = new five.Keypad({
-      controller: "MPR121",
-      address: 0x5A
+      controller: "MPR121"
     });
   }
 
   if (argv.show === 2) {
     keypad = new five.Keypad({
       controller: "MPR121",
-      address: 0x5A,
       keys: [
         ["!", "@", "#"],
         ["$", "%", "^"],
@@ -30,18 +28,13 @@ board.on("ready", function() {
   if (argv.show === 3) {
     keypad = new five.Keypad({
       controller: "MPR121",
-      address: 0x5A,
       keys: ["!", "@", "#", "$", "%", "^", "&", "-", "+", "_", "=", ":"]
     });
   }
 
-  ["change", "press", "hold", "release"].forEach(function(event) {
-    keypad.on(event, function(data) {
-      // console.log("Event: %s, Which: %s", event, data);
-
-      if (event === "press") {
-        exec("say " + data);
-      }
+  ["change", "press", "hold", "release"].forEach(function(eventType) {
+    keypad.on(eventType, function(data) {
+      console.log("Event: %s, Target: %s", eventType, data.which);
     });
   });
 });
diff --git a/eg/keypad-MPR121QR2.js b/eg/keypad-MPR121QR2.js
@@ -9,15 +9,13 @@ board.on("ready", function() {
 
   if (argv.show === 1) {
     keypad = new five.Keypad({
-      controller: "MPR121QR2",
-      address: 0x5A
+      controller: "MPR121QR2"
     });
   }
 
   if (argv.show === 2) {
     keypad = new five.Keypad({
       controller: "MPR121QR2",
-      address: 0x5A,
       keys: [
         ["!", "@", "#"],
         ["$", "%", "^"],
@@ -29,18 +27,13 @@ board.on("ready", function() {
   if (argv.show === 3) {
     keypad = new five.Keypad({
       controller: "MPR121QR2",
-      address: 0x5A,
       keys: ["!", "@", "#", "$", "%", "^", "&", "-", "+"]
     });
   }
 
-  ["change", "press", "hold", "release"].forEach(function(event) {
-    keypad.on(event, function(data) {
-      // console.log("Event: %s, Which: %s", event, data);
-
-      if (event === "press") {
-        exec("say " + data);
-      }
+  ["change", "press", "hold", "release"].forEach(function(eventType) {
+    keypad.on(eventType, function(data) {
+      console.log("Event: %s, Target: %s", eventType, data.which);
     });
   });
 });
diff --git a/eg/keypad-analog-ad.js b/eg/keypad-analog-ad.js
@@ -33,13 +33,9 @@ board.on("ready", function() {
     });
   }
 
-  ["change", "press", "hold", "release"].forEach(function(event) {
-    keypad.on(event, function(data) {
-      console.log("Event: %s, Which: %s", event, data);
-
-      if (event === "press") {
-        exec("say " + data);
-      }
+  ["change", "press", "hold", "release"].forEach(function(eventType) {
+    keypad.on(eventType, function(data) {
+      console.log("Event: %s, Target: %s", eventType, data.which);
     });
   });
 });

diff --git a/eg/keypad-analog-vkey.js b/eg/keypad-analog-vkey.js
@@ -35,13 +35,9 @@ board.on("ready", function() {
     });
   }
 
-  ["change", "press", "hold", "release"].forEach(function(event) {
-    keypad.on(event, function(data) {
-      console.log("Event: %s, Which: %s", event, data);
-
-      if (event === "press") {
-        exec("say " + data);
-      }
+  ["change", "press", "hold", "release"].forEach(function(eventType) {
+    keypad.on(eventType, function(data) {
+      console.log("Event: %s, Target: %s", eventType, data.which);
     });
   });
 });

diff --git a/lib/definitions/mpr121.js b/lib/definitions/mpr121.js
@@ -2,30 +2,73 @@
 module.exports = {
   MAPS: {
     MPR121QR2:   {
-      8: 1,
-      5: 2,
-      2: 3,
-      7: 4,
-      4: 5,
-      1: 6,
-      6: 7,
-      3: 8,
-      0: 9,
+      KEYS: {
+        0: 1,
+        1: 2,
+        2: 3,
+        3: 4,
+        4: 5,
+        5: 6,
+        6: 7,
+        7: 8,
+        8: 9,
+      },
+      TARGETS: {
+        256: 0,
+        32: 1,
+        4: 2,
+        128: 3,
+        16: 4,
+        2: 5,
+        64: 6,
+        8: 7,
+        1: 8,
+      }
     },
+    // MPR121:   {
+    //   3: 1,
+    //   7: 2,
+    //   11: 3,
+    //   2: 4,
+    //   6: 5,
+    //   10: 6,
+    //   1: 7,
+    //   5: 8,
+    //   9: 9,
+    //   0: 10,
+    //   4: 11,
+    //   8: 12,
+    // },
     MPR121:   {
-      3: 1,
-      7: 2,
-      11: 3,
-      2: 4,
-      6: 5,
-      10: 6,
-      1: 7,
-      5: 8,
-      9: 9,
-      0: 10,
-      4: 11,
-      8: 12,
-    }
+      KEYS: {
+        0: 1,
+        1: 2,
+        2: 3,
+        3: 4,
+        4: 5,
+        5: 6,
+        6: 7,
+        7: 8,
+        8: 9,
+        9: 10,
+        10: 11,
+        11: 12,
+      },
+      TARGETS: {
+        8: 0,
+        128: 1,
+        2048: 2,
+        4: 3,
+        64: 4,
+        1024 : 5,
+        2: 6,
+        32: 7,
+        512: 8,
+        1: 9,
+        16: 10,
+        256: 11,
+      }
+    },
   },
   MPR121_DEFAULT_ADDRESS: 0x5A,