Skip to content

Commit

Permalink
show manufacturer in usb port list
Browse files Browse the repository at this point in the history
  • Loading branch information
apla committed Feb 2, 2015
1 parent 6aa620b commit 5b0eee0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 17 deletions.
5 changes: 4 additions & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,10 @@ define(function (require, exports, module) {
// tr = $('<tr />').appendTo('#cuwire-panel tbody');

ports.forEach (function (port) {
$('<li><a href="#">'+self.boardNameForPort (port)+"</a></li>")
$('<li><a href="#">'
+self.boardNameForPort (port)
+ (port.manufacturer ? ' - <i>'+port.manufacturer+'</i>' : "")
+"</a></li>")
.on ('click', self.setPort.bind (self, port))
.appendTo(cuwirePortDD);
});
Expand Down
21 changes: 7 additions & 14 deletions node/cuwireDomain.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 <extension-folder>/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 <extension-folder>/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) {
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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.",
Expand All @@ -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",
}
}

0 comments on commit 5b0eee0

Please sign in to comment.