using serial port list from cuwire

apla · Feb 1, 2015 · cda05ee · cda05ee
1 parent cc441f3
commit cda05ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/node/cuwireDomain.js b/node/cuwireDomain.js
@@ -208,24 +208,21 @@
 			return;
 		}
 
-		if (!serialport)
-			return;
-
 		var err, result = [];
-		serialport.list(function (err, ports) {
-			ports.forEach(function(port) {
+		CuWireSerial.list (function (err, ports) {
+			if (err)
+				return cb(err);
+			ports.forEach (function (port) {
 				result.push ({
 					name:         port.comName,
 					manufacturer: port.manufacturer,
 					vendorId:     port.vendorId,
 					productId:    port.productId,
-					serial:       port.serial,
+					serialNumber: port.serialNumber,
 					connected:    (port.comName in serialComms) ? true : false
 				});
-//				console.log(port.comName);
-//				console.log(port.pnpId);
-//				console.log(port.manufacturer);
 			});
+
 			cb (err, result);
 		});
 

diff --git a/node/cuwireSerialBrackets.js b/node/cuwireSerialBrackets.js
@@ -1,6 +1,6 @@
 var util = require ('util');
 
-var CuwireSerial = require ('cuwire/console');
+var CuwireSerial = require ('cuwire/serial');
 
 function CuwireSerialBrackets (options) {
 }

diff --git a/node/node_modules/cuwire b/node/node_modules/cuwire
+2 −1		cli-options.json
+25 −9		cli.js
+5 −3		data.js
+5 −4		package.json
+51 −1		serial.js