diff options
| -rw-r--r-- | boards.txt | 112 | ||||
| -rw-r--r--[-rwxr-xr-x] | bootloaders/caterina-LilyPadUSB/Caterina-LilyPadUSB.hex | 0 | ||||
| -rw-r--r-- | cores/arduino/CDC.cpp | 6 | ||||
| -rw-r--r-- | cores/arduino/USBAPI.h | 3 | ||||
| -rw-r--r-- | variants/yun/pins_arduino.h | 27 |
5 files changed, 104 insertions, 44 deletions
@@ -23,7 +23,7 @@ yun.upload.wait_for_upload_port=true yun.bootloader.tool=avrdude yun.bootloader.low_fuses=0xff yun.bootloader.high_fuses=0xd8 -yun.bootloader.extended_fuses=0xcb +yun.bootloader.extended_fuses=0xfb yun.bootloader.file=caterina/Caterina-Yun.hex yun.bootloader.unlock_bits=0x3F yun.bootloader.lock_bits=0x2F @@ -35,7 +35,7 @@ yun.build.pid=0x8041 yun.build.usb_product="Arduino Yun" yun.build.board=AVR_YUN yun.build.core=arduino -yun.build.variant=leonardo +yun.build.variant=yun yun.build.extra_flags={build.usb_flags} ############################################################## @@ -156,57 +156,85 @@ nano.menu.cpu.atmega168.build.mcu=atmega168 ############################################################## -mega2560.name=Arduino Mega 2560 or Mega ADK -mega2560.vid.0=0x2341 -mega2560.pid.0=0x0044 -mega2560.vid.1=0x2341 -mega2560.pid.1=0x003f -mega2560.cpu=2560 or ADK - -mega2560.upload.tool=avrdude -mega2560.upload.protocol=wiring -mega2560.upload.maximum_size=258048 -mega2560.upload.maximum_data_size=8192 -mega2560.upload.speed=115200 - -mega2560.bootloader.tool=avrdude -mega2560.bootloader.low_fuses=0xFF -mega2560.bootloader.high_fuses=0xD8 -mega2560.bootloader.extended_fuses=0xFD -mega2560.bootloader.file=stk500v2/stk500boot_v2_mega2560.hex -mega2560.bootloader.unlock_bits=0x3F -mega2560.bootloader.lock_bits=0x0F - -mega2560.build.mcu=atmega2560 -mega2560.build.f_cpu=16000000L -mega2560.build.board=AVR_MEGA2560 -mega2560.build.core=arduino -mega2560.build.variant=mega +mega.name=Arduino Mega or Mega 2560 -############################################################## - -mega.name=Arduino Mega (ATmega1280) -mega.cpu=ATmega1280 +mega.vid.0=0x2341 +mega.pid.0=0x0010 +mega.vid.1=0x2341 +mega.pid.1=0x0042 mega.upload.tool=avrdude -mega.upload.protocol=arduino -mega.upload.maximum_size=126976 mega.upload.maximum_data_size=8192 -mega.upload.speed=57600 mega.bootloader.tool=avrdude mega.bootloader.low_fuses=0xFF -mega.bootloader.high_fuses=0xDA -mega.bootloader.extended_fuses=0xF5 -mega.bootloader.file=atmega/ATmegaBOOT_168_atmega1280.hex mega.bootloader.unlock_bits=0x3F mega.bootloader.lock_bits=0x0F -mega.build.mcu=atmega1280 mega.build.f_cpu=16000000L -mega.build.board=AVR_MEGA mega.build.core=arduino mega.build.variant=mega +# default board may be overridden by the cpu menu +mega.build.board=AVR_MEGA2560 + +## Arduino Mega w/ ATmega2560 +## ------------------------- +mega.menu.cpu.atmega2560=ATmega2560 (Mega 2560) + +mega.menu.cpu.atmega2560.upload.protocol=wiring +mega.menu.cpu.atmega2560.upload.maximum_size=258048 +mega.menu.cpu.atmega2560.upload.speed=115200 + +mega.menu.cpu.atmega2560.bootloader.high_fuses=0xD8 +mega.menu.cpu.atmega2560.bootloader.extended_fuses=0xFD +mega.menu.cpu.atmega2560.bootloader.file=stk500v2/stk500boot_v2_mega2560.hex + +mega.menu.cpu.atmega2560.build.mcu=atmega2560 +mega.menu.cpu.atmega2560.build.board=AVR_MEGA2560 + +## Arduino Mega w/ ATmega1280 +## ------------------------- +mega.menu.cpu.atmega1280=ATmega1280 + +mega.menu.cpu.atmega1280.upload.protocol=arduino +mega.menu.cpu.atmega1280.upload.maximum_size=126976 +mega.menu.cpu.atmega1280.upload.speed=57600 + +mega.menu.cpu.atmega1280.bootloader.high_fuses=0xDA +mega.menu.cpu.atmega1280.bootloader.extended_fuses=0xF5 +mega.menu.cpu.atmega1280.bootloader.file=atmega/ATmegaBOOT_168_atmega1280.hex + +mega.menu.cpu.atmega1280.build.mcu=atmega1280 +mega.menu.cpu.atmega1280.build.board=AVR_MEGA + +############################################################## + +megaADK.name=Arduino Mega ADK + +megaADK.vid.0=0x2341 +megaADK.pid.0=0x003f +megaADK.vid.1=0x2341 +megaADK.pid.1=0x0044 + +megaADK.upload.tool=avrdude +megaADK.upload.protocol=wiring +megaADK.upload.maximum_size=258048 +megaADK.upload.maximum_data_size=8192 +megaADK.upload.speed=115200 + +megaADK.bootloader.tool=avrdude +megaADK.bootloader.low_fuses=0xFF +megaADK.bootloader.high_fuses=0xD8 +megaADK.bootloader.extended_fuses=0xFD +megaADK.bootloader.file=stk500v2/stk500boot_v2_mega2560.hex +megaADK.bootloader.unlock_bits=0x3F +megaADK.bootloader.lock_bits=0x0F + +megaADK.build.mcu=atmega2560 +megaADK.build.f_cpu=16000000L +megaADK.build.board=AVR_ADK +megaADK.build.core=arduino +megaADK.build.variant=mega ############################################################## @@ -649,7 +677,7 @@ robotControl.name=Arduino Robot Control robotControl.upload.tool=avrdude robotControl.upload.protocol=avr109 robotControl.upload.maximum_size=28672 -robotControl.upload.data_size=2560 +robotControl.upload.maximum_data_size=2560 robotControl.upload.speed=57600 robotControl.upload.disable_flushing=true robotControl.upload.use_1200bps_touch=true @@ -679,7 +707,7 @@ robotMotor.name=Arduino Robot Motor robotMotor.upload.tool=avrdude robotMotor.upload.protocol=avr109 robotMotor.upload.maximum_size=28672 -robotMotor.upload.data_size=2560 +robotMotor.upload.maximum_data_size=2560 robotMotor.upload.speed=57600 robotMotor.upload.disable_flushing=true robotMotor.upload.use_1200bps_touch=true diff --git a/bootloaders/caterina-LilyPadUSB/Caterina-LilyPadUSB.hex b/bootloaders/caterina-LilyPadUSB/Caterina-LilyPadUSB.hex index abc5ca8..abc5ca8 100755..100644 --- a/bootloaders/caterina-LilyPadUSB/Caterina-LilyPadUSB.hex +++ b/bootloaders/caterina-LilyPadUSB/Caterina-LilyPadUSB.hex diff --git a/cores/arduino/CDC.cpp b/cores/arduino/CDC.cpp index fb25a96..a691306 100644 --- a/cores/arduino/CDC.cpp +++ b/cores/arduino/CDC.cpp @@ -115,7 +115,11 @@ bool WEAK CDC_Setup(Setup& setup) int _serialPeek = -1; -void Serial_::begin(uint16_t baud_count) +void Serial_::begin(unsigned long baud_count) +{ +} + +void Serial_::begin(unsigned long baud_count, byte config) { } diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h index cabecf3..da2e869 100644 --- a/cores/arduino/USBAPI.h +++ b/cores/arduino/USBAPI.h @@ -36,7 +36,8 @@ struct ring_buffer; class Serial_ : public Stream { public: - void begin(uint16_t baud_count); + void begin(unsigned long); + void begin(unsigned long, uint8_t); void end(void); virtual int available(void); diff --git a/variants/yun/pins_arduino.h b/variants/yun/pins_arduino.h new file mode 100644 index 0000000..43912e7 --- /dev/null +++ b/variants/yun/pins_arduino.h @@ -0,0 +1,27 @@ +/* + pins_arduino.h - Pin definition functions for Arduino + Part of Arduino - http://www.arduino.cc/ + + Copyright (c) 2013 Arduino LLC + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General + Public License along with this library; if not, write to the + Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Boston, MA 02111-1307 USA + + $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $ +*/ + +#include "../leonardo/pins_arduino.h" + +#define LED_BUILTIN 13 |