node-red-node-arduino - npm Package Compare versions

Comparing version 0.0.7 to 0.0.8

35-arduino.js

@@ -19,4 +19,6 @@ /**
     "use strict";
-    var ArduinoFirmata = require('arduino-firmata');
 
+    var Board = require('firmata');
+    var SP = require('firmata/node_modules/serialport');
+
     // The Board Definition - this opens (and closes) the connection
@@ -26,27 +28,19 @@ function ArduinoNode(n) {
         this.device = n.device || null;
-        this.repeat = n.repeat||25;
         var node = this;
-        node.board = new ArduinoFirmata();
-        // TODO: nls
-        ArduinoFirmata.list(function (err, ports) {
-            if (!node.device) {
-                node.log(RED._("arduino.status.connectfirst"));
-                node.board.connect();
+
+        node.board = Board(node.device, function(e) {
+            //console.log("ERR",e);
+            if ((e !== undefined) && (e.toString().indexOf("cannot open") !== -1) ) {
+                node.error(RED._("arduino.errors.portnotfound",{device:node.device}));
             }
-            else {
-                if (ports.indexOf(node.device) === -1) {
-                    node.warn(RED._("arduino.errors.devnotfound",{dev:node.device}));
-                    node.board.connect();
-                }
-                else {
-                    node.log(RED._("arduino.status.connect",{device:node.device}));
-                    node.board.connect(node.device);
-                }
+            else if (e === undefined) {
+                node.board.on('ready', function() {
+                    node.log(RED._("arduino.status.connected",{device:node.board.sp.path}));
+                    if (RED.settings.verbose) {
+                        node.log(RED._("arduino.status.version",{version:node.board.firmware.name+"-"+node.board.version.major+"."+node.board.version.minor}));
+                    }
+                });
             }
-
-            node.board.on('boardReady', function() {
-                node.log(RED._("arduino.status.connected",{device:node.board.serialport_name}));
-                if (RED.settings.verbose) {
-                    node.log(RED._("arduino.status.version",{version:node.board.boardVersion}));
-                }
+            node.board.on('close', function() {
+                node.error(RED._("arduino.status.portclosed"));
             });
@@ -58,3 +52,3 @@ });
                 try {
-                    node.board.close(function() {
+                    node.board.sp.close(function() {
                         done();
@@ -82,35 +76,24 @@ if (RED.settings.verbose) { node.log(RED._("arduino.status.portclosed")); }
             node.status({fill:"red",shape:"ring",text:"node-red:common.status.connecting"});
-            node.board.on('connect', function() {
+            node.board.on('ready', function() {
                 node.status({fill:"green",shape:"dot",text:"node-red:common.status.connected"});
-                //console.log("i",node.state,node.pin);
-                if (node.state == "ANALOG") {
-                    node.board.on('analogChange', function(e) {
-                        if (e.pin == node.pin) {
-                            var msg = {payload:e.value, topic:"A"+e.pin};
-                            node.send(msg);
-                        }
+                if (node.state === "ANALOG") {
+                    node.board.pinMode(node.pin, 0x02);
+                    node.board.analogRead(node.pin, function(v) {
+                        node.send({payload:v, topic:"A"+node.pin});
                     });
                 }
-                if (node.state == "INPUT") {
-                    node.board.pinMode(node.pin, ArduinoFirmata.INPUT);
-                    node.board.on('digitalChange', function(e) {
-                        if (e.pin == node.pin) {
-                            var msg = {payload:e.value, topic:e.pin};
-                            node.send(msg);
-                        }
+                if (node.state === "INPUT") {
+                    node.board.pinMode(node.pin, 0x00);
+                    node.board.digitalRead(node.pin, function(v) {
+                        node.send({payload:v, topic:node.pin});
                     });
                 }
-                if (node.state == "SYSEX") {
-                    node.board.on('sysex', function(e) {
-                        var msg = {payload:e, topic:"sysex"};
-                        node.send(msg);
-                    });
-                }
                 if (node.state == "STRING") {
-                    node.board.on('sysex', function(e) {
-                        var string = new Buffer(e.data.slice(0, -1)).toString("utf8").replace(/\0/g, "");
-                        var msg = {payload:string, topic:"string"};
-                        node.send(msg);
+                    node.board.on('string', function(v) {
+                        node.send({payload:v, topic:"string"});
                     });
                 }
+                node.board.on('close', function() {
+                    node.status({fill:"grey",shape:"ring",text:"node-red:common.status.not-connected"});
+                });
             });
@@ -138,18 +121,16 @@ }
 
-            node.board.on('connect', function() {
+            node.board.on('ready', function() {
                 node.status({fill:"green",shape:"dot",text:"node-red:common.status.connected"});
-                //console.log("o",node.state,node.pin);
-
                 node.on("input", function(msg) {
                     if (node.state === "OUTPUT") {
-                        node.board.pinMode(node.pin, node.state);
+                        node.board.pinMode(node.pin, 0x01);
                         if ((msg.payload === true)||(msg.payload.toString() == "1")||(msg.payload.toString().toLowerCase() == "on")) {
-                            node.board.digitalWrite(node.pin, true);
+                            node.board.digitalWrite(node.pin, node.board.HIGH);
                         }
                         if ((msg.payload === false)||(msg.payload.toString() == "0")||(msg.payload.toString().toLowerCase() == "off")) {
-                            node.board.digitalWrite(node.pin, false);
+                            node.board.digitalWrite(node.pin, node.board.LOW);
                         }
                     }
                     if (node.state === "PWM") {
-                        node.board.pinMode(node.pin, node.state);
+                        node.board.pinMode(node.pin, 0x03);
                         msg.payload = parseInt((msg.payload * 1) + 0.5);
@@ -161,3 +142,3 @@ if ((msg.payload >= 0) && (msg.payload <= 255)) {
                     if (node.state === "SERVO") {
-                        node.board.pinMode(node.pin, node.state);
+                        node.board.pinMode(node.pin, 0x04);
                         msg.payload = parseInt((msg.payload * 1) + 0.5);
@@ -169,15 +150,11 @@ if ((msg.payload >= 0) && (msg.payload <= 180)) {
                     if (node.state === "SYSEX") {
-                        node.board.sysex(msg.payload);
+                        node.board.sysexCommand(msg.payload);
                     }
                     if (node.state === "STRING") {
-                        var bytes = new Buffer(msg.payload.toString(), "utf8");
-                        var data = [];
-                        for (var i = 0, length = bytes.length; i < length; i++) {
-                            data.push(bytes[i] & 0x7F);
-                            data.push((bytes[i] >> 7) & 0x7F);
-                        }
-                        data.push(0);
-                        node.board.sysex(0x71, data);
+                        node.board.sendString(msg.payload.toString());
                     }
                 });
+                node.board.on('close', function() {
+                    node.status({fill:"grey",shape:"ring",text:"node-red:common.status.not-connected"});
+                });
             });
@@ -192,6 +169,7 @@ }
     RED.httpAdmin.get("/arduinoports", RED.auth.needsPermission("arduino.read"), function(req,res) {
-        ArduinoFirmata.list(function (err, ports) {
+        SP.list(function(error, ports) {
             res.json(ports);
         });
+
     });
 }

locales/en-US/35-arduino.json

@@ -16,3 +16,3 @@ {
             "version": "version: __version__",
-            "portclosed": "port closed"
+            "portclosed": "Arduino serial port closed"
         },
@@ -38,2 +38,3 @@ "state": {
             "portnotconf": "port not configured",
+            "portnotfound": "port not found : __device__",
             "devnotfound": "device __dev__ not found. Trying to find board."
@@ -40,0 +41,0 @@ }

package.json

 {
     "name"          : "node-red-node-arduino",
-    "version"       : "0.0.7",
+    "version"       : "0.0.8",
     "description"   : "A Node-RED node to talk to an Arduino running firmata",
     "dependencies"  : {
-        "arduino-firmata"   : "0.3.4"
+        "firmata"   : "~0.13.0"
     },
@@ -8,0 +8,0 @@ "repository" : {

No alert changes

Worsened metrics

Total package byte prevSize

29957

-2.51%

Lines of code

196

-10.09%

Dependency changes

• + Added

  firmata@~0.13.0

• + Added

  bindings@1.2.1
  (transitive)

• + Added

  browser-serialport@2.1.0
  (transitive)

• + Added

  call-bind@1.0.8
  (transitive)

• + Added

  call-bind-apply-helpers@1.0.2
  (transitive)

• + Added

  call-bound@1.0.4
  (transitive)

• + Added

  commander@2.20.3
  (transitive)

• + Added

  debug@2.6.9
  (transitive)

• + Added

  define-data-property@1.1.4
  (transitive)

• + Added

  define-properties@1.2.1
  (transitive)

• + Added

  dunder-proto@1.0.1
  (transitive)

• + Added

  es-define-property@1.0.1
  (transitive)

• + Added

  es-errors@1.3.0
  (transitive)

• + Added

  es-object-atoms@1.1.1
  (transitive)

• + Added

  es6-promise@3.3.1
  (transitive)

• + Added

  es6-shim@0.33.13
  (transitive)

• + Added

  firmata@0.13.0
  (transitive)

• + Added

  function-bind@1.1.2
  (transitive)

• + Added

  get-intrinsic@1.3.0
  (transitive)

• + Added

  get-proto@1.0.1
  (transitive)

• + Added

  gopd@1.2.0
  (transitive)

• + Added

  has-property-descriptors@1.0.2
  (transitive)

• + Added

  has-symbols@1.1.0
  (transitive)

• + Added

  hasown@2.0.2
  (transitive)

• + Added

  math-intrinsics@1.1.0
  (transitive)

• + Added

  ms@2.0.0
  (transitive)

• + Added

  nan@2.22.2
  (transitive)

• + Added

  object-keys@1.1.1
  (transitive)

• + Added

  object.assign@4.1.7
  (transitive)

• + Added

  serialport@3.1.2
  (transitive)

• + Added

  set-function-length@1.2.2
  (transitive)

• - Removed

  arduino-firmata@0.3.4

• - Removed

  @serialport/binding-mock@10.2.2
  (transitive)

• - Removed

  @serialport/bindings-cpp@13.0.0
  (transitive)

• - Removed

  @serialport/bindings-interface@1.2.2
  (transitive)

• - Removed

  @serialport/parser-byte-length@13.0.0
  (transitive)

• - Removed

  @serialport/parser-cctalk@13.0.0
  (transitive)

• - Removed

  @serialport/parser-delimiter@12.0.013.0.0
  (transitive)

• - Removed

  @serialport/parser-inter-byte-timeout@13.0.0
  (transitive)

• - Removed

  @serialport/parser-packet-length@13.0.0
  (transitive)

• - Removed

  @serialport/parser-readline@12.0.013.0.0
  (transitive)

• - Removed

  @serialport/parser-ready@13.0.0
  (transitive)

• - Removed

  @serialport/parser-regex@13.0.0
  (transitive)

• - Removed

  @serialport/parser-slip-encoder@13.0.0
  (transitive)

• - Removed

  @serialport/parser-spacepacket@13.0.0
  (transitive)

• - Removed

  @serialport/stream@13.0.0
  (transitive)

• - Removed

  arduino-firmata@0.3.4
  (transitive)

• - Removed

  debug@4.4.04.4.1
  (transitive)

• - Removed

  eventemitter2@6.4.9
  (transitive)

• - Removed

  ms@2.1.3
  (transitive)

• - Removed

  node-addon-api@8.3.0
  (transitive)

• - Removed

  node-gyp-build@4.8.4
  (transitive)

• - Removed

  serialport@13.0.0
  (transitive)