From 8d0fdd9fbfa26f915eda1e761797ae2cd59ada44 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 17 Nov 2021 18:08:13 +0000
Subject: [PATCH] Fix mcp3xxx refs to new variables

to Close #856
---
 .travis.yml                   |  5 ++---
 hardware/mcp3008/package.json |  2 +-
 hardware/mcp3008/pimcp3008.js | 19 +++++++++----------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d30ad360..1ad40c11 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,12 @@
 sudo: false
 language: node_js
 matrix:
-  allow_failures:
-    - node_js: 16
+  # allow_failures:
+  #   - node_js: 16
   include:
     - node_js: 16
     - node_js: 14
     - node_js: 12
-    - node_js: 10
     # - python: 2.7
     #   language: python
     #   before_script: pip install flake8
diff --git a/hardware/mcp3008/package.json b/hardware/mcp3008/package.json
index ed6df3b6..2efdca9e 100644
--- a/hardware/mcp3008/package.json
+++ b/hardware/mcp3008/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-pi-mcp3008",
-    "version"       : "0.5.0",
+    "version"       : "0.5.1",
     "description"   : "A Node-RED node to read from the MCP3008 Analogue to Digital Converter",
     "dependencies"  : {
         "mcp-spi-adc": "^3.2.0"
diff --git a/hardware/mcp3008/pimcp3008.js b/hardware/mcp3008/pimcp3008.js
index ebb0066a..b39c63f1 100644
--- a/hardware/mcp3008/pimcp3008.js
+++ b/hardware/mcp3008/pimcp3008.js
@@ -29,7 +29,6 @@ module.exports = function(RED) {
         this.bus = parseInt(n.bus || 0);
         this.dev = n.dev || "3008";
         this.mcp3xxx = [];
-        var node = this;
         this.cb = function (err) { if (err) { node.error("Error: "+err); } };
         this.opt = { speedHz:20000, deviceNumber:node.dnum, busNumber:node.bus };
         var chans = parseInt(this.dev.substr(3));
@@ -40,14 +39,14 @@ module.exports = function(RED) {
                 fs.statSync("/dev/spidev"+node.bus+"."+node.dnum);
                 if (node.mcp3xxx.length === 0) {
                     for (var i=0; i<chans; i++) {
-                        if (node.dev === "3002") { mcp3xxx.push(mcpadc.openMcp3002(i, opt, cb)); }
-                        if (node.dev === "3004") { mcp3xxx.push(mcpadc.openMcp3004(i, opt, cb)); }
-                        if (node.dev === "3008") { mcp3xxx.push(mcpadc.openMcp3008(i, opt, cb)); }
-                        if (node.dev === "3201") { mcp3xxx.push(mcpadc.openMcp3201(i, opt, cb)); }
-                        if (node.dev === "3202") { mcp3xxx.push(mcpadc.openMcp3202(i, opt, cb)); }
-                        if (node.dev === "3204") { mcp3xxx.push(mcpadc.openMcp3204(i, opt, cb)); }
-                        if (node.dev === "3208") { mcp3xxx.push(mcpadc.openMcp3208(i, opt, cb)); }
-                        if (node.dev === "3304") { mcp3xxx.push(mcpadc.openMcp3304(i, opt, cb)); }
+                        if (node.dev === "3002") { node.mcp3xxx.push(mcpadc.openMcp3002(i, node.opt, node.cb)); }
+                        if (node.dev === "3004") { node.mcp3xxx.push(mcpadc.openMcp3004(i, node.opt, node.cb)); }
+                        if (node.dev === "3008") { node.mcp3xxx.push(mcpadc.openMcp3008(i, node.opt, node.cb)); }
+                        if (node.dev === "3201") { node.mcp3xxx.push(mcpadc.openMcp3201(i, node.opt, node.cb)); }
+                        if (node.dev === "3202") { node.mcp3xxx.push(mcpadc.openMcp3202(i, node.opt, node.cb)); }
+                        if (node.dev === "3204") { node.mcp3xxx.push(mcpadc.openMcp3204(i, node.opt, node.cb)); }
+                        if (node.dev === "3208") { node.mcp3xxx.push(mcpadc.openMcp3208(i, node.opt, node.cb)); }
+                        if (node.dev === "3304") { node.mcp3xxx.push(mcpadc.openMcp3304(i, node.opt, node.cb)); }
                     }
                 }
                 node.on("input", function(msg) {
@@ -76,7 +75,7 @@ module.exports = function(RED) {
                     for (var i=0; i<chans; i++) {
                         node.mcp3xxx[i].close(function() { j += 1; if (j === chans) {done()} });
                     }
-                    mcp3xxx = [];
+                    node.mcp3xxx = [];
                 }
                 else { done(); }
             });