Merge branch 'platforms-arm' of https://github.com/arduino/ARM into platforms-arm

Author: Thibault RICHARD

hardware/arduino/sam/boards.txt

@@ -4,28 +4,28 @@ arduino_due_u.name=Arduino DueU Dev. Ed.
 arduino_due_u.upload.tool=bossac
 arduino_due_u.upload.protocol=sam-ba
 arduino_due_u.upload.maximum_size=49152
+arduino_due_u.build.vid=0x2341
+arduino_due_u.build.pid=0x003E
 arduino_due_u.build.mcu=cortex-m3
 arduino_due_u.build.f_cpu=96000000L
 arduino_due_u.build.core=sam
-arduino_due_u.build.extra_flags=-D__SAM3U4E__ -mthumb
+arduino_due_u.build.extra_flags=-D__SAM3U4E__ -mthumb -DUSB_PID={build.pid} -DUSB_VID={build.vid} -DUSBCON
 arduino_due_u.build.ldscript=linker_scripts/gcc/flash.ld
 arduino_due_u.build.variant=arduino_due_u
 arduino_due_u.build.variant_system_lib=libsam_sam3u4e_gcc_rel.a
-arduino_due_u.build.vid=0x2341
-arduino_due_u.build.pid=0xcafe
 
 ##############################################################
 
 arduino_due_x.name=Arduino DueX Dev. Ed.
 arduino_due_x.upload.tool=bossac
 arduino_due_x.upload.protocol=sam-ba
 arduino_due_x.upload.maximum_size=49152
+arduino_due_x.build.vid=0x2341
+arduino_due_x.build.pid=0x003E
 arduino_due_x.build.mcu=cortex-m3
 arduino_due_x.build.f_cpu=84000000L
 arduino_due_x.build.core=sam
-arduino_due_x.build.extra_flags=-D__SAM3X8E__ -mthumb
+arduino_due_x.build.extra_flags=-D__SAM3X8E__ -mthumb -DUSB_PID={build.pid} -DUSB_VID={build.vid} -DUSBCON
 arduino_due_x.build.ldscript=linker_scripts/gcc/flash.ld
 arduino_due_x.build.variant=arduino_due_x
 arduino_due_x.build.variant_system_lib=libsam_sam3x8e_gcc_rel.a
-arduino_due_x.build.vid=0x2341
-arduino_due_x.build.pid=0xcafe

hardware/arduino/sam/cores/sam/Arduino.h

@@ -203,11 +203,11 @@ extern const PinDescription g_APinDescription[] ;
 
   #define USB_PID_LEONARDO   0x0034
   #define USB_PID_MICRO      0x0035
-  #define USB_PID_DUE        0xcafe
+  #define USB_PID_DUE        0x003E
 
-	#include "USBDesc.h"
-	#include "USBCore.h"
-	#include "USBAPI.h"
+  #include "USB/USBDesc.h"
+  #include "USB/USBCore.h"
+  #include "USB/USBAPI.h"
 #endif // if defined USBCON
 
 #endif // Arduino_h

hardware/arduino/sam/cores/sam/USB/USBCore.cpp

@@ -79,13 +79,14 @@ const uint16_t STRING_IMANUFACTURER[12] = {
 #define DEVICE_CLASS 0x00
 #endif
 
-#if defined CDC_ENABLED && defined HID_ENABLED
-#define USB_PID_FINAL (USB_PID|0x1001UL)
-#elif defined HID_ENABLED
-#define USB_PID_FINAL (USB_PID|0x1000UL)
-#elif defined CDC_ENABLED
-#define USB_PID_FINAL (USB_PID|0x0001UL)
-#endif
+//#if defined CDC_ENABLED && defined HID_ENABLED
+//#define USB_PID_FINAL (USB_PID|0x1001UL)
+//#elif defined HID_ENABLED
+//#define USB_PID_FINAL (USB_PID|0x1000UL)
+//#elif defined CDC_ENABLED
+//#define USB_PID_FINAL (USB_PID|0x0001UL)
+//#endif
+#define USB_PID_FINAL USB_PID
 
 //	DEVICE DESCRIPTOR
 const DeviceDescriptor USB_DeviceDescriptor =

hardware/arduino/sam/cores/sam/USB/USBDesc.h

@@ -17,7 +17,7 @@
 */
 
 #define CDC_ENABLED
-//#define HID_ENABLED
+#define HID_ENABLED
 
 
 #ifdef CDC_ENABLED

hardware/arduino/sam/platform.txt

@@ -3,8 +3,8 @@
 # --------------------- 
 
 name=Atmel SAM3
-#compiler.path={runtime.ide.path}/hardware/tools/g++_arm_none_eabi/bin/
-compiler.path=C:/arm-none-eabi-gcc-4_6/bin/
+compiler.path={runtime.ide.path}/hardware/tools/g++_arm_none_eabi/bin/
+#compiler.path=C:/arm-none-eabi-gcc-4_6/bin/
 compiler.c.cmd=arm-none-eabi-gcc
 compiler.c.flags=-c -g -Os -w -mlong-calls -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf
 compiler.c.elf.cmd=arm-none-eabi-gcc