From 5b0eee0a3dfd39f664f019712cacbc3af74c7404 Mon Sep 17 00:00:00 2001 From: apla Date: Mon, 2 Feb 2015 18:34:55 +0300 Subject: [PATCH] show manufacturer in usb port list --- main.js | 5 ++++- node/cuwireDomain.js | 21 +++++++-------------- package.json | 5 +++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/main.js b/main.js index 3b5f590..f2384a7 100644 --- a/main.js +++ b/main.js @@ -109,7 +109,10 @@ define(function (require, exports, module) { // tr = $('').appendTo('#cuwire-panel tbody'); ports.forEach (function (port) { - $('
  • '+self.boardNameForPort (port)+"
  • ") + $('
  • ' + +self.boardNameForPort (port) + + (port.manufacturer ? ' - '+port.manufacturer+'' : "") + +"
  • ") .on ('click', self.setPort.bind (self, port)) .appendTo(cuwirePortDD); }); diff --git a/node/cuwireDomain.js b/node/cuwireDomain.js index 3d2bf13..eb1f4ac 100644 --- a/node/cuwireDomain.js +++ b/node/cuwireDomain.js @@ -193,20 +193,13 @@ var cb = arguments[arguments.length-1]; - var serialport; - try { - // https://github.com/voodootikigod/node-serialport - // HOWTO built THAT on mac (got idea from https://github.com/jasonsanjose/brackets-sass/tree/master/node): - // 1) cd /node; npm install node-gyp node-pre-gyp serialport - // 2) cd node_modules/serialport - // 3) /Applications/devel/Brackets.app/Contents/MacOS/Brackets-node ../../node_modules/node-pre-gyp/bin/node-pre-gyp --arch=ia32 rebuild - - // current binaries got from http://node-serialport.s3.amazonaws.com - serialport = require("serialport"); - } catch (e) { - cb ("cannot load serialport module"+e); - return; - } + // https://github.com/voodootikigod/node-serialport + // HOWTO built THAT on mac (got idea from https://github.com/jasonsanjose/brackets-sass/tree/master/node): + // 1) cd /node; npm install node-gyp node-pre-gyp serialport + // 2) cd node_modules/serialport + // 3) /Applications/devel/Brackets.app/Contents/MacOS/Brackets-node ../../node_modules/node-pre-gyp/bin/node-pre-gyp --arch=ia32 rebuild + + // current binaries got from http://node-serialport.s3.amazonaws.com var err, result = []; CuWireSerial.list (function (err, ports) { diff --git a/package.json b/package.json index 5bd2d8c..a2bb273 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "brackets-cuwire", - "version": "0.4.2", + "version": "0.5.1", "title": "cuwire: IDE for microcontrollers", "homepage": "https://github.com/apla/brackets-cuwire", "description": "Now Brackets can be used to develop software for MCUs. Throw away you Arduino, Energia and others.", @@ -18,7 +18,8 @@ }, "scripts": { - "archive": "git archive --format zip -o release/brackets-cuwire-0.4.2.zip master", "prepare-binaries": "" + "archive-old": "git archive --format zip -o release/${npm_package_name}-${npm_package_version}.zip master", + "archive": "git-archive-all --prefix='' release/${npm_package_name}-${npm_package_version}.zip", } }