From 232a11983b1327ba57af3279acab4e366e5596ee Mon Sep 17 00:00:00 2001
From: Dave C-J <dave@conway-jones.co.uk>
Date: Fri, 18 Jul 2014 17:04:22 +0100
Subject: [PATCH] More tweaks to makey node - colours, jshint fixes, icons,
 readme etc.

---
 hardware/makey/42-makey.html                      | 4 ++--
 hardware/makey/42-makey.js                        | 4 +---
 hardware/makey/{82-makey.rules => 42-makey.rules} | 0
 hardware/makey/README.md                          | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename hardware/makey/{82-makey.rules => 42-makey.rules} (100%)

diff --git a/hardware/makey/42-makey.html b/hardware/makey/42-makey.html
index a194e1cb..57949c14 100644
--- a/hardware/makey/42-makey.html
+++ b/hardware/makey/42-makey.html
@@ -16,7 +16,7 @@
 
 <script type="text/x-red" data-template-name="makeymakey">
     <div class="form-row">
-        <label for="node-input-name"><i class="icon-tag"></i> Name</label>
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
 </script>
@@ -33,7 +33,7 @@
 <script type="text/javascript">
     RED.nodes.registerType('makeymakey',{
         category: 'advanced-input',
-        color:"#6da082",
+        color:"#f6e686",
         defaults: {
             name: {value:""},
             vid: {value:"0x1b4f",required:true},
diff --git a/hardware/makey/42-makey.js b/hardware/makey/42-makey.js
index 75a95da1..a2d0d0e9 100644
--- a/hardware/makey/42-makey.js
+++ b/hardware/makey/42-makey.js
@@ -22,7 +22,6 @@ function MakeyNode(n) {
     this.vid = 0x1b4f;      // MakeyMakey vendor ID
     this.pid = 0x2b75;      // MakeyMakey product ID
     var node = this;
-    //node.log("Want:"+node.vid.toString(16)+":"+node.pid.toString(16));
     var path = null;
     var tout;
     var click = false;
@@ -65,13 +64,12 @@ function MakeyNode(n) {
                 else if (key.modKeys[0] === "ctrl") {
                     if (key.charCodes.length === 0) {
                         click = !click;
-                        (click) ? (msg.payload = "click") : (msg.payload = "clock");
+                        msg.payload = (click) ? "click" : "clock";
                         node.send(msg);
                     }
                 }
                 else { console.log(key); }
             });
-
         } catch(err) { node.warn("can't open MakeyMakey: Do you need root access ?"); }
     }
     else {
diff --git a/hardware/makey/82-makey.rules b/hardware/makey/42-makey.rules
similarity index 100%
rename from hardware/makey/82-makey.rules
rename to hardware/makey/42-makey.rules
diff --git a/hardware/makey/README.md b/hardware/makey/README.md
index 90c5eff2..20bbd99e 100644
--- a/hardware/makey/README.md
+++ b/hardware/makey/README.md
@@ -34,4 +34,4 @@ Known Issues
 
 1) Every now and then something causes the MakeyMakey HID to become detached (lose focus) from this app and re-attach to another (the in focus) app... whereupon the emulated keys will end up in the wrong window... - Any ideas on how to stop this would be greatly appreciated - but I suspect it's a fundamental issue with the MakeyMakey pretending to be a HID.
 
-2) Default usage is such that you have to run as root. On Debian based systems you can copy the file 82-makey.rules to the /etc/udev/rules.d folder - this should let anyone then access the MakeyMakey .
+2) Default usage is such that you have to run as root. On Debian based systems you can copy the file <i>42-makey.rules</i> to the <code>/etc/udev/rules.d/</code> folder - this should let anyone then access the MakeyMakey. To restart udev use <pre>sudo udevadm control --reload-rules</pre>