uploader.js fixed for mac and linux cases

sebba · sebba · commit 11168ca7efd6 · 2015-08-12T10:34:28.000+02:00
diff --git a/node/compiler/uploader.js b/node/compiler/uploader.js
@@ -27,7 +27,7 @@ function scanForPortReturn(list1,options, cb) {
 			{
 				for(var i = 0; i < options.device.uid.length; i++) {
 					var suf_pid = options.device.uid[i].pid.substring(2).toUpperCase();
-					if (list2[item].pnpId.indexOf('PID_' + suf_pid) > -1 || list2[item].pnpId==""){
+					if (list2[item].pnpId.indexOf('PID_' + suf_pid) > -1 || list2[item].productId=="0x"+suf_pid || list2[item].productId=="0x"+suf_pid.toLowerCase()){
 					//if (list2[item].pnpId=="") {
 						console.log("SELECTED : " + JSON.stringify(list2[item]));
 						selected = list2[item].comName;

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ function scanForPortReturn(list1,options, cb) {`
`27`	`27`	`{`
`28`	`28`	`for(var i = 0; i < options.device.uid.length; i++) {`
`29`	`29`	`var suf_pid = options.device.uid[i].pid.substring(2).toUpperCase();`
`30`		`- if (list2[item].pnpId.indexOf('PID_' + suf_pid) > -1 \|\| list2[item].pnpId==""){`
	`30`	`+ if (list2[item].pnpId.indexOf('PID_' + suf_pid) > -1 \|\| list2[item].productId=="0x"+suf_pid \|\| list2[item].productId=="0x"+suf_pid.toLowerCase()){`
`31`	`31`	`//if (list2[item].pnpId=="") {`
`32`	`32`	`console.log("SELECTED : " + JSON.stringify(list2[item]));`
`33`	`33`	`selected = list2[item].comName;`