diff options
| author | Zach Eveland <zeveland@blacklabel-development.com> | 2012-04-09 08:06:35 -0400 |
|---|---|---|
| committer | Zach Eveland <zeveland@blacklabel-development.com> | 2012-04-09 08:06:35 -0400 |
| commit | ec83f55b626f3b9b5da4a0782b8fa81ca72a8933 (patch) | |
| tree | 9835bd953de97978439b2a6a7ee9a960613c4c5a | |
| parent | afedb5a92bac5c7f62a02ba085b4fff2b4f2070a (diff) | |
sketch USB VID and PID values are passed in from boards.txt at compile time now. changed sketch PIDs to final values. also uncommented Micro section in boards.txt
| -rw-r--r-- | boards.txt | 37 | ||||
| -rw-r--r-- | cores/arduino/USBCore.cpp | 4 | ||||
| -rw-r--r-- | cores/arduino/USBDesc.h | 4 | ||||
| -rw-r--r-- | variants/leonardo/pins_arduino.h | 2 | ||||
| -rw-r--r-- | variants/micro/pins_arduino.h | 2 |
5 files changed, 23 insertions, 26 deletions
@@ -155,31 +155,36 @@ leonardo.bootloader.low_fuses=0xff leonardo.bootloader.high_fuses=0xd8 leonardo.bootloader.extended_fuses=0xcb leonardo.bootloader.path=caterina -leonardo.bootloader.file=Caterina.hex +leonardo.bootloader.file=Caterina-Leonardo.hex leonardo.bootloader.unlock_bits=0x3F leonardo.bootloader.lock_bits=0x2F leonardo.build.mcu=atmega32u4 leonardo.build.f_cpu=16000000L +leonardo.build.vid=0x2341 +leonardo.build.pid=0x8034 leonardo.build.core=arduino leonardo.build.variant=leonardo ############################################################## -#micro.name=Arduino Micro -#micro.upload.protocol=arduino -#micro.upload.maximum_size=30720 -#micro.upload.speed=1200 -#micro.bootloader.low_fuses=0xde -#micro.bootloader.high_fuses=0xda -#micro.bootloader.extended_fuses=0xcb -#micro.bootloader.path=caterina -#micro.bootloader.file=Caterina-Micro.hex -#micro.bootloader.unlock_bits=0x3F -#micro.bootloader.lock_bits=0x2F -#micro.build.mcu=atmega32u4 -#micro.build.f_cpu=16000000L -#micro.build.core=arduino -#micro.build.variant=micro +micro.name=Arduino Micro +micro.upload.protocol=avr109 +micro.upload.maximum_size=28672 +micro.upload.speed=57600 +micro.upload.disable_flushing=true +micro.bootloader.low_fuses=0xff +micro.bootloader.high_fuses=0xd8 +micro.bootloader.extended_fuses=0xcb +micro.bootloader.path=caterina +micro.bootloader.file=Caterina-Micro.hex +micro.bootloader.unlock_bits=0x3F +micro.bootloader.lock_bits=0x2F +micro.build.mcu=atmega32u4 +micro.build.f_cpu=16000000L +micro.build.vid=0x2341 +micro.build.pid=0x8035 +micro.build.core=arduino +micro.build.variant=micro ############################################################## diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp index c360d26..d1aeace 100644 --- a/cores/arduino/USBCore.cpp +++ b/cores/arduino/USBCore.cpp @@ -51,9 +51,9 @@ const u16 STRING_LANGUAGE[2] = { const u16 STRING_IPRODUCT[17] = { (3<<8) | (2+2*16), -#if USB_PID == USB_PID_LEONARDO +#if USB_PID == 0x8034 'A','r','d','u','i','n','o',' ','L','e','o','n','a','r','d','o' -#elif USB_PID == USB_PID_MICRO +#elif USB_PID == 0x8035 'A','r','d','u','i','n','o',' ','M','i','c','r','o',' ',' ',' ' #endif }; diff --git a/cores/arduino/USBDesc.h b/cores/arduino/USBDesc.h index 5cd90ad..900713e 100644 --- a/cores/arduino/USBDesc.h +++ b/cores/arduino/USBDesc.h @@ -60,8 +60,4 @@ #define IMANUFACTURER 1 #define IPRODUCT 2 -#define USB_PID_LEONARDO 0x0801 -#define USB_PID_MICRO 0x0035 -#define USB_VID 0x2341 // arduino LLC vid -#define USB_PID ARDUINO_MODEL_USB_PID diff --git a/variants/leonardo/pins_arduino.h b/variants/leonardo/pins_arduino.h index 753aa93..ff9e4f9 100644 --- a/variants/leonardo/pins_arduino.h +++ b/variants/leonardo/pins_arduino.h @@ -27,8 +27,6 @@ #include <avr/pgmspace.h> -#define ARDUINO_MODEL_USB_PID 0x0801 - #define TX_RX_LED_INIT DDRD |= (1<<5), DDRB |= (1<<0) #define TXLED0 PORTD |= (1<<5) #define TXLED1 PORTD &= ~(1<<5) diff --git a/variants/micro/pins_arduino.h b/variants/micro/pins_arduino.h index c9f25eb..06a5858 100644 --- a/variants/micro/pins_arduino.h +++ b/variants/micro/pins_arduino.h @@ -23,5 +23,3 @@ */ #include "../leonardo/pins_arduino.h" -#undef ARDUINO_MODEL_USB_PID -#define ARDUINO_MODEL_USB_PID 0x0035
\ No newline at end of file |