From fa3136b469cd2d6127e8ab20193ee440075b4770 Mon Sep 17 00:00:00 2001 From: Thibault RICHARD Date: Thu, 10 May 2012 19:28:35 +0200 Subject: [PATCH] [SAM] GIT clean up. --- hardware/arduino/sam/boards.txt | 8 ++-- .../arduino/sam/cores/sam/USB/USBCore.cpp | 13 +----- .../cores/sam/build_gcc/libarduino_adk2.mk | 4 +- .../sam/build_gcc/libarduino_arduino_due_u.mk | 4 +- .../sam/build_gcc/libarduino_arduino_due_x.mk | 4 +- .../sam/cores/sam/libsam_sam3x8e_gcc_dbg.a | Bin 244890 -> 244890 bytes .../validation_usb_device/test_usb_device.cpp | 42 +----------------- .../arduino_due_x/libsam_sam3x8e_gcc_rel.a | Bin 75306 -> 75306 bytes 8 files changed, 14 insertions(+), 61 deletions(-) diff --git a/hardware/arduino/sam/boards.txt b/hardware/arduino/sam/boards.txt index 4fb139529..137e92b3d 100644 --- a/hardware/arduino/sam/boards.txt +++ b/hardware/arduino/sam/boards.txt @@ -4,8 +4,6 @@ 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 @@ -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.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=0x003e ############################################################## @@ -20,8 +20,6 @@ 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 @@ -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.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=0x003e diff --git a/hardware/arduino/sam/cores/sam/USB/USBCore.cpp b/hardware/arduino/sam/cores/sam/USB/USBCore.cpp index 673805edc..9b283d6d0 100644 --- a/hardware/arduino/sam/cores/sam/USB/USBCore.cpp +++ b/hardware/arduino/sam/cores/sam/USB/USBCore.cpp @@ -79,21 +79,12 @@ 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 -#define USB_PID_FINAL USB_PID - // DEVICE DESCRIPTOR 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 = - 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); diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_adk2.mk b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_adk2.mk index 0df7ea912..520885596 100644 --- a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_adk2.mk +++ b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_adk2.mk @@ -73,8 +73,8 @@ endif include $(TOOLCHAIN).mk -CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe -CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe +CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e +CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e #------------------------------------------------------------------------------- ifdef DEBUG diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk index e69adcbad..e610a1b9d 100644 --- a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk +++ b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_u.mk @@ -73,8 +73,8 @@ endif include $(TOOLCHAIN).mk -CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe -CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe +CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e +CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e #------------------------------------------------------------------------------- ifdef DEBUG diff --git a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk index ad7b9f480..0a71c2f31 100644 --- a/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk +++ b/hardware/arduino/sam/cores/sam/build_gcc/libarduino_arduino_due_x.mk @@ -73,8 +73,8 @@ endif include $(TOOLCHAIN).mk -CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe -CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0xcafe +CFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e +CPPFLAGS += -DUSB_VID=0x2341 -DUSB_PID=0x003e #------------------------------------------------------------------------------- ifdef DEBUG diff --git a/hardware/arduino/sam/cores/sam/libsam_sam3x8e_gcc_dbg.a b/hardware/arduino/sam/cores/sam/libsam_sam3x8e_gcc_dbg.a index 88d9d7bea60a19fd91f10dae0a7014245eb1e177..ad30b43b31a5d8361fc5ad26ef538bc1c8c6ceb0 100644 GIT binary patch delta 341 zcmbRBlW*2fz6mmHX66Rw1_m3IN+du`GZTyH2evYbZQdl|P>dqL*TcbqB49M-4zhsw zX6?Db`VbYC5Hn_-328Kb%Ntkp3D^r*viu5HlrX8|i z5mSTh6I__m)S(=ZZQ|R7bC~*FkwnC{@7u`qfgMHU)J~=^s3NxxGM&hVs4)bYBeDH} kF0+y`l8D&$e+kSAq9`I(Wy~RRFcF|rB(|@a!u(Dh0C~S{2mk;8 delta 341 zcmbRBlW*2fz6mmHre+2P2F4qeN+cjm!|4aMGKy{9B;inuBEZ+f!GR)RH02JmfcR$Z zxxxA#ttU6Dk@w(r}>^no2BVhnM>shvz;P(^MXWIB -// 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() { + Serial.begin(57600); Mouse.begin(); } void loop() { - Mouse.move(10, 0, 0); - delay(1000); -} -*/ - -/* -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() { + Mouse.move(1, 0, 0); if (Serial.available() > 0) { @@ -73,4 +36,3 @@ void loop() { } delay(10); } - diff --git a/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a b/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a index 4a27d212bcf978c4e257dbe977743be7393afbea..00960209f107115c1cdfe6cccce3e8d88424e8d7 100644 GIT binary patch delta 315 zcmZ2=hGo?mmI*R!X66QFhUOcU3Zz-V%*l$);+xk=KVgM(Kb`_|6?wSeT#3!swXbTx zx#F8ogviJvxSL93_z}F#7R?{nA$FKfKARL1DSti@(U!s_~x5)CZnkDSn@#v zqTURwf6CqnUIbr!Gw11MR%HIl3-(a`=3w_ukU delta 317 zcmZ2=hGo?mmI*R!rlyvbmL?mO3Zx-S!|4TVjN+TuOFw3X2pCO1pe?p}ogxnxl)w3a z_8Sc-8>0ARh_pPC;!Pzo{1C1&Sg%F%2XOLqweGXKit7f5{Z%{S*vMp56f)@GHWTV;W02z|w)ZeI-eZC~ dXFE{j2NOd3_7+Y?6-lUmkYBbRQDRJE1^|sBV*vmF