Merge branch 'master' of https://github.com/arduino-org/ArduinoExt

Author: sergiotomasello

node/compiler.js

@@ -20,7 +20,6 @@
     var uploader        = require('./compiler/uploader');
     var platform        = require('./compiler/platform');
 
-
     var domainName = "org-arduino-ide-domain-compiler";
 
     var dm, prg = "arduino";
@@ -271,7 +270,6 @@
     }
 
 
-
     function compile(options, sketchDir, up) {
         console.log("I'm Compiler and I'm wearing my sunglasses");
         dm.emitEvent (domainName, "console-log", "Start Building");
@@ -374,7 +372,7 @@
             calculateLibs(includedLibs,includepaths,libextra, debug, cb, plat, options.sketchbook);
         });
 
-        //3. actually compile code
+        //3. compile code
         tasks.push(function(cb) {
             console.log("moving on now");
             debug("include paths = ", JSON.stringify(includepaths,null, '   '));

node/compiler/uploader.js

@@ -11,8 +11,7 @@ var SerialPort = require('serialport').SerialPort,
 	sp = null;
 
 var SerialPort2 = require('serialport');
-	
-//function runAVRDude(hexfile, portpath, options, debug, cb) {
+
 function runAVRDude(hexfile, options, debug, cb) {
     debug("running AVR dude");
     if(options.platform.useSerial()) {
@@ -43,17 +42,6 @@ function runAVRDude(hexfile, options, debug, cb) {
     }
 
     console.log("running", uploadcmd.join(' '));
-	//---------------------------------
-	//sp = new SerialPort(portpath,{
-//	sp = new SerialPort(options.port,{ baudRate:1200 });
-//	sp = new SerialPort(options.port);
-
-//	sp.on('open',function() {
-//		sp.close(function(err) {
-//			if(!err){
-				//var start = new Date().getTime();
-				//while(((new Date).getTime()-start)<=2000){};
-				
 				var result = child_process.execFile(
 					uploadcmd[0],
 					uploadcmd.slice(1),
@@ -77,11 +65,6 @@ function runAVRDude(hexfile, options, debug, cb) {
 						}
 					}
 				);
-//			}
-//			else
-//				console.log("APERTURA errore");
-//		});
-//	});
 }
 
 function scanForPortReturn(list1,options, cb) {
@@ -97,8 +80,7 @@ function scanForPortReturn(list1,options, cb) {
             },700);
         } else {
             console.log('we are back to normal!');
-//TODO    controllare
-			console.log("....................................................")
+//TODO
 			setTimeout(function() {
 			console.log(JSON.stringify(list2));
 				console.log("TEST 2: "+options.device.uid.length);
@@ -111,11 +93,9 @@ function scanForPortReturn(list1,options, cb) {
 					//if (list2[item].pnpId=="") {
 						console.log("SELECTED : " + JSON.stringify(list2[item]));
 						selected = list2[item].comName;
-						//cb(list2[item].comName);
 					}
 				}
 			}
-                //cb(list1[list1.length-1].comName);
 				cb(selected);
             },500);
         }
@@ -194,8 +174,6 @@ exports.upload = function(hexfile,options, publish, callback) {
         }
     }
     console.log("uploading to device using ",options.device);
-
-    //if(options.device.bootloader.path == 'caterina') {
     if(options.device.bootloader.file.indexOf('caterina')> -1) {
         console.log("need to do the leonardo dance");
 
@@ -233,7 +211,7 @@ exports.upload = function(hexfile,options, publish, callback) {
     }
 }
 
-//TODO modificare port con options.port e lasciare un solo parametro
+//TODO edit port -> options.port ; 1 parameter
 exports.writeBootloader = function(port, options){
 	    console.log("running AVR dude");
 
@@ -254,8 +232,7 @@ exports.writeBootloader = function(port, options){
 
 	if(options.verboseupload)
 		cmd.push('-v','-v','-v', '-v');
-		
-	console.log("******************************************");
+
     console.log("writing bootloader \n", uploadcmd.join(' '));
 
 	var newcmd = customizeUpload(uploadcmd, uploadcmd[searchStringInArray('-c', uploadcmd)].slice(2));

node/discover.js

@@ -75,8 +75,8 @@
 				Async.filter(ports,
 					function(item, cbk_2_1){
 
-						//MACOSX
-						if(process.platform == "mac" || process.platform == "darwin"){
+						//MACOSX AND LINUX
+						if(process.platform == "mac" || process.platform == "darwin" || process.platform == "linux"){
 							if(pids.length == 0)
 								cbk_2_1(true);
 							else
@@ -86,7 +86,7 @@
 									cbk_2_1(false);
 						}
 
-						//WIN:
+						//WIN
 						if(process.platform == "win" || process.platform == "win32" || process.platform == "win64"){
 
 							item.vendorId  = "0X"+item.pnpId.substring(item.pnpId.indexOf("VID_")+4, item.pnpId.indexOf("VID_")+8);
@@ -100,9 +100,6 @@
 								else
 									cbk_2_1(false);
 						}
-
-						//TODO LINUX
-
 					},
 					function(result){
 						cbk_2(null, result);
@@ -116,8 +113,8 @@
 
 						bport.address = port.comName;		//ADDRESS
 						bport.protcol = "serial";			//PROTOCOL
-						//MACOSX
-						if(process.platform == "mac" || process.platform == "darwin"){
+						//MACOSX AND LINUX
+						if(process.platform == "mac" || process.platform == "darwin" || process.platform == "linux"){
 							bport.vid =  port.vendorId;
 							bport.pid =  port.productId;
 						}