rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

[sam] Fixed IDE compiling process

Browse Source
This commit is contained in:
Cristian Maglie 2012-05-09 15:34:00 +02:00
parent 4d59afcc64
commit bb23ef2e3b
5 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hardware/arduino/sam/boards.txt
View File

@ -4,15 +4,15 @@ arduino_due_u.name=Arduino DueU Dev. Ed.
arduino_due_u.upload.tool=bossac arduino_due_u.upload.tool=bossac
arduino_due_u.upload.protocol=sam-ba arduino_due_u.upload.protocol=sam-ba
arduino_due_u.upload.maximum_size=49152 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.mcu=cortex-m3
arduino_due_u.build.f_cpu=96000000L arduino_due_u.build.f_cpu=96000000L
arduino_due_u.build.core=sam 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.ldscript=linker_scripts/gcc/flash.ld
arduino_due_u.build.variant=arduino_due_u arduino_due_u.build.variant=arduino_due_u
arduino_due_u.build.variant_system_lib=libsam_sam3u4e_gcc_rel.a arduino_due_u.build.variant_system_lib=libsam_sam3u4e_gcc_rel.a
arduino_due_u.build.vid=0x2341
arduino_due_u.build.pid=0xcafe
############################################################## ##############################################################
@ -20,12 +20,12 @@ arduino_due_x.name=Arduino DueX Dev. Ed.
arduino_due_x.upload.tool=bossac arduino_due_x.upload.tool=bossac
arduino_due_x.upload.protocol=sam-ba arduino_due_x.upload.protocol=sam-ba
arduino_due_x.upload.maximum_size=49152 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.mcu=cortex-m3
arduino_due_x.build.f_cpu=84000000L arduino_due_x.build.f_cpu=84000000L
arduino_due_x.build.core=sam 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.ldscript=linker_scripts/gcc/flash.ld
arduino_due_x.build.variant=arduino_due_x arduino_due_x.build.variant=arduino_due_x
arduino_due_x.build.variant_system_lib=libsam_sam3x8e_gcc_rel.a arduino_due_x.build.variant_system_lib=libsam_sam3x8e_gcc_rel.a
arduino_due_x.build.vid=0x2341
arduino_due_x.build.pid=0xcafe

8
hardware/arduino/sam/cores/sam/Arduino.h
View File

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

15
hardware/arduino/sam/cores/sam/USB/USBCore.cpp
View File

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

2
hardware/arduino/sam/cores/sam/USB/USBDesc.h
View File

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

4
hardware/arduino/sam/platform.txt
View File

@ -3,8 +3,8 @@
# --------------------- # ---------------------
name=Atmel SAM3 name=Atmel SAM3
#compiler.path={runtime.ide.path}/hardware/tools/g++_arm_none_eabi/bin/ compiler.path={runtime.ide.path}/hardware/tools/g++_arm_none_eabi/bin/
compiler.path=C:/arm-none-eabi-gcc-4_6/bin/ #compiler.path=C:/arm-none-eabi-gcc-4_6/bin/
compiler.c.cmd=arm-none-eabi-gcc 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.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 compiler.c.elf.cmd=arm-none-eabi-gcc