diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2012-11-04 22:49:14 +0100 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2012-11-04 22:49:14 +0100 |
| commit | 706f5c74b2bfc51e27ab283c4959b998008aeffc (patch) | |
| tree | 9e243b4582251be221ce7a4a5ee6609d5960659c /boards.txt | |
| parent | 1408d931fe86a36adc9993823cd06442d85be8e0 (diff) | |
| parent | bb6569d0695eef174a190a4c0fd570deb55ecfc2 (diff) | |
Merged 1.0.2
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
app/src/processing/app/debug/AvrdudeUploader.java
build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
hardware/arduino/boards.txt
Diffstat (limited to 'boards.txt')
| -rw-r--r-- | boards.txt | 30 |
1 files changed, 29 insertions, 1 deletions
@@ -301,6 +301,34 @@ menu.cpu.bt.atmega168.build.mcu=atmega168 ############################################################## +LilyPadUSB.name=LilyPad Arduino USB + +LilyPadUSB.upload.tool=avrdude +LilyPadUSB.upload.protocol=avr109 +LilyPadUSB.upload.maximum_size=28672 +LilyPadUSB.upload.speed=57600 +LilyPadUSB.upload.disable_flushing=true +LilyPadUSB.upload.use_1200bps_touch=true +LilyPadUSB.upload.wait_for_upload_port=true + +LilyPadUSB.bootloader.tool=avrdude +LilyPadUSB.bootloader.low_fuses=0xff +LilyPadUSB.bootloader.high_fuses=0xd8 +LilyPadUSB.bootloader.extended_fuses=0xce +LilyPadUSB.bootloader.file=caterina-LilyPadUSB/ Caterina-LilyPadUSB.hex +LilyPadUSB.bootloader.unlock_bits=0x3F +LilyPadUSB.bootloader.lock_bits=0x2F + +LilyPadUSB.build.mcu=atmega32u4 +LilyPadUSB.build.f_cpu=8000000L +LilyPadUSB.build.vid=0x1B4F +LilyPadUSB.build.pid=0x9208 +LilyPadUSB.build.core=arduino +LilyPadUSB.build.variant=leonardo +LilyPadUSB.build.extra_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} + +############################################################## + lilypad.name=LilyPad Arduino lilypad.upload.tool=avrdude @@ -448,4 +476,4 @@ menu.cpu.atmegang.atmega8.bootloader.low_fuses=0xdf menu.cpu.atmegang.atmega8.bootloader.high_fuses=0xca menu.cpu.atmegang.atmega8.bootloader.file=atmegang/ATmegaBOOT.hex -menu.cpu.atmegang.atmega8.build.mcu=atmega8
\ No newline at end of file +menu.cpu.atmegang.atmega8.build.mcu=atmega8 |