rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-03-15 12:29:26 +01:00
Code Issues Releases Activity

[SAM] GIT clean up.

Browse Source
This commit is contained in:
Thibault RICHARD 2012-05-10 19:28:35 +02:00
parent 0da190fb3e
commit fa3136b469
8 changed files with 14 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,6 @@ 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
@ -13,6 +11,8 @@ arduino_due_u.build.extra_flags=-D__SAM3U4E__ -mthumb -DUSB_PID={build.pid} -DUS
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=0x003e
############################################################## ##############################################################
@ -20,8 +20,6 @@ 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
@ -29,3 +27,5 @@ arduino_due_x.build.extra_flags=-D__SAM3X8E__ -mthumb -DUSB_PID={build.pid} -DUS
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=0x003e

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

@ -79,21 +79,12 @@ const uint16_t STRING_IMANUFACTURER[12] = {
#define DEVICE_CLASS 0x00 #define DEVICE_CLASS 0x00
#endif #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 // DEVICE DESCRIPTOR
const DeviceDescriptor USB_DeviceDescriptor = const DeviceDescriptor USB_DeviceDescriptor =
D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID_FINAL,0x100,IMANUFACTURER,IPRODUCT,0,1); D_DEVICE(0x00,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);
const DeviceDescriptor USB_DeviceDescriptorA = const DeviceDescriptor USB_DeviceDescriptorA =
D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID_FINAL,0x100,IMANUFACTURER,IPRODUCT,0,1); D_DEVICE(DEVICE_CLASS,0x00,0x00,64,USB_VID,USB_PID,0x100,IMANUFACTURER,IPRODUCT,0,1);

4
hardware/arduino/sam/cores/sam/build_gcc/libarduino_adk2.mk
View File

@ -73,8 +73,8 @@ endif
include $(TOOLCHAIN).mk include $(TOOLCHAIN).mk
CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
ifdef DEBUG ifdef DEBUG

4
hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk
View File

@ -73,8 +73,8 @@ endif
include $(TOOLCHAIN).mk include $(TOOLCHAIN).mk
CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
ifdef DEBUG ifdef DEBUG

4
hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk
View File

@ -73,8 +73,8 @@ endif
include $(TOOLCHAIN).mk include $(TOOLCHAIN).mk
CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
ifdef DEBUG ifdef DEBUG

BIN
hardware/arduino/sam/cores/sam/libsam_sam3x8e_gcc_dbg.a
View File

Binary file not shown.

42
hardware/arduino/sam/cores/sam/validation_usb_device/test_usb_device.cpp
View File

@ -19,51 +19,14 @@
#include "variant.h" #include "variant.h"
#include <stdio.h> #include <stdio.h>
// set pin numbers for the five buttons:
const int upButton = 2;
const int downButton = 3;
const int leftButton = 4;
const int rightButton = 5;
const int mouseButton = 6;
int range = 5; // output range of X or Y movement; affects movement speed
int responseDelay = 10; // response delay of the mouse, in ms
/*
void setup() { void setup() {
Serial.begin(57600);
Mouse.begin(); Mouse.begin();
} }
void loop() { void loop() {
Mouse.move(10, 0, 0);
delay(1000);
}
*/
Mouse.move(1, 0, 0);
/*
void setup() {
// initialize the digital pin as an output.
// Pin 13 has an LED connected on most Arduino boards:
//pinMode(13, OUTPUT);
Serial1.begin(115200) ;
printf("USB test starting...\r\n");
}
void loop() {
//digitalWrite(13, HIGH); // set the LED on
//delay(1000); // wait for a second
//digitalWrite(13, LOW); // set the LED off
delay(1000); // wait for a second
printf("loop...\r\n");
}
*/
void setup() {
Serial.begin(57600);
}
void loop() {
if (Serial.available() > 0) if (Serial.available() > 0)
{ {
@ -73,4 +36,3 @@ void loop() {
} }
delay(10); delay(10);
} }

BIN
hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a
View File

Binary file not shown.