Expander: don't require an address when unnecessary. Fixes gh-1291

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
rwaldron · Mar 30, 2017 · cc85c69 · cc85c69
1 parent 23a9526
commit cc85c69
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/lib/expander.js b/lib/expander.js
@@ -1812,6 +1812,10 @@ Object.keys(Controllers).forEach(function(name) {
   });
 });
 
+var nonAddressable = [
+  "74HC595"
+];
+
 function Expander(opts) {
   if (!(this instanceof Expander)) {
     return new Expander(opts);
@@ -1836,6 +1840,11 @@ function Expander(opts) {
     }
   );
 
+  if (nonAddressable.includes(opts.controller) &&
+      typeof this.address === "undefined") {
+    this.address = Fn.uid();
+  }
+
   expander = active.get(this.address);
 
   if (expander) {

diff --git a/test/expander.js b/test/expander.js
@@ -2905,6 +2905,32 @@ exports["Expander - 74HC595"] = {
     test.done();
   },
 
+  multipleInstancesOfNonAddressableExpanders: function(test) {
+    test.expect(1);
+
+    test.doesNotThrow(function() {
+      var a = new five.Expander({
+        controller: "74HC595",
+        pins: {
+          data: 6,
+          clock: 7,
+          latch: 8,
+        }
+      });
+
+      var b = new five.Expander({
+        controller: "74HC595",
+        pins: {
+          data: 9,
+          clock: 10,
+          latch: 11,
+        }
+      });
+    });
+
+    test.done();
+  },
+
   normalize: function(test) {
     test.expect(8);