samd board files updated. platformSAMD.js and uploader.js fixed.

Author: sebba

hardware/arduino/samd/opt/boards/0010.zeropro.json

@@ -21,6 +21,7 @@
   "build": {
     "mcu": "cortex-m0plus",
     "f_cpu": "48000000L",
+    "usb_product" : "Arduino M0 Pro",
     "board": "SAM_ZERO",
     "core": "arduino",
     "extra_flags": "-D__SAMD21G18A__ -mthumb",

hardware/arduino/samd/opt/boards/0020.zeroproedbg.json

@@ -17,6 +17,7 @@
   "build": {
     "mcu": "cortex-m0plus",
     "f_cpu": "48000000L",
+    "usb_product" : "Arduino M0 Pro",
     "board": "SAM_ZERO",
     "core": "arduino",
     "extra_flags": "-D__SAMD21G18A__ -mthumb ",

node/compiler/platformSAMD.js

@@ -205,7 +205,19 @@ function Platform() {
             cmd.push('-DUSB_VID='+options.device.build.vid)
         if(options.device.build.pid)
             cmd.push('-DUSB_PID='+options.device.build.pid)
-			
+
+        cmd.push('-DUSBCON')
+
+        if(options.device.build.usb_manifacturer)
+            cmd.push('-DUSB_MANUFACTURER='+options.device.build.usb_manifacturer)
+        else
+            cmd.push('-DUSB_MANUFACTURER= ')
+
+        if(options.device.build.usb_product)
+            cmd.push('-DUSB_PRODUCT="'+options.device.build.usb_product+'"')
+        else
+            cmd.push('-DUSB_PRODUCT=')
+
         var cmsispaths = this.getCMISPath();
         for (var i in cmsispaths)
                 cmd.push("-I" + cmsispaths[i]);
@@ -252,7 +264,19 @@ function Platform() {
             cmd.push('-DUSB_VID='+options.device.build.vid)
         if(options.device.build.pid)
             cmd.push('-DUSB_PID='+options.device.build.pid)
-		
+
+        cmd.push('-DUSBCON')
+
+        if(options.device.build.usb_manifacturer)
+            cmd.push('-DUSB_MANUFACTURER='+options.device.build.usb_manifacturer)
+        else
+            cmd.push('-DUSB_MANUFACTURER= ')
+
+        if(options.device.build.usb_product)
+            cmd.push('-DUSB_PRODUCT="'+options.device.build.usb_product+'"')
+        else
+            cmd.push('-DUSB_PRODUCT=')
+
 		var cmsispaths = this.getCMISPath();
         for (var i in cmsispaths)
             cmd.push("-I" + cmsispaths[i]);
@@ -354,7 +378,6 @@ function Platform() {
     }
 
     this.getUploadCmd = function(hexfile, options, outdir){
-		
 		if(options.device.upload.native_usb)
 		{	
 			//Native Usb Case       
@@ -363,8 +386,8 @@ function Platform() {
 				'-C'+this.getAvrDudeConf()
 			];
 
-			if(options.verboseupload)
-				cmd.push('-v','-v');
+			//if(options.verboseupload)
+				uploadcmd.push('-v','-v');
 
 			uploadcmd.push( '-p'+options.device.build.emu_mcu,
 							'-c'+options.device.upload.protocol,

node/compiler/uploader.js

@@ -25,7 +25,6 @@ function scanForPortReturn(list1,options, cb) {
 			setTimeout(function() {
 			for(item in list2)
 			{
-			console.log("ELEMENT : " + JSON.stringify(item));
 				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==""){