From f6a0c45961498aa20fb9d393dc7e02b096a75dc8 Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Thu, 3 Oct 2013 20:32:28 +0200 Subject: [PATCH 1/3] Split Arduino ADK into separate board --- hardware/arduino/avr/boards.txt | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/hardware/arduino/avr/boards.txt b/hardware/arduino/avr/boards.txt index 2181292c3..7324849b3 100644 --- a/hardware/arduino/avr/boards.txt +++ b/hardware/arduino/avr/boards.txt @@ -210,6 +210,35 @@ mega.build.variant=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 + +############################################################## + leonardo.name=Arduino Leonardo leonardo.vid.0=0x2341 leonardo.pid.0=0x0036 From b3a1c8424dcd6aa195596758b994ecc6475edcdd Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Thu, 3 Oct 2013 20:33:19 +0200 Subject: [PATCH 2/3] Removed incorrect readme --- libraries/USBHost/extras/README | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 libraries/USBHost/extras/README diff --git a/libraries/USBHost/extras/README b/libraries/USBHost/extras/README deleted file mode 100644 index 51a0d145d..000000000 --- a/libraries/USBHost/extras/README +++ /dev/null @@ -1,7 +0,0 @@ -This is the most reliable library to control the USB host chip MAX3421E. It is used to handle the communication between the Arduino ADK board and Android devices supporting Accessory mode. It of course works with other devices, but documenting that is outside our scope. - -It is of course based in the original by CircuitsAtHome.com and has been patched by Follower (RancidBacon.com) - -CircuitsAtHome has discontinued the development of this project. The Arduino Team commissioned a patch to the library to make it reliable up to a 99%. -CircuitsAtHome revision of the code can be found at https://github.com/felis/USB_Host_Shield_2.0. However the Arduino Team does not recommend using that library, yet, with ADK compatible boards, as v1 is much more stable. - From 4e0f508590252d9bc5ad1005f70debd4790b04c1 Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Thu, 3 Oct 2013 20:36:25 +0200 Subject: [PATCH 3/3] Combine Mega and Mega 2560 --- hardware/arduino/avr/boards.txt | 75 ++++++++++++++++----------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/hardware/arduino/avr/boards.txt b/hardware/arduino/avr/boards.txt index 7324849b3..6c4e5174e 100644 --- a/hardware/arduino/avr/boards.txt +++ b/hardware/arduino/avr/boards.txt @@ -156,58 +156,55 @@ 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 (ATmega1280) -mega.cpu=ATmega1280 +mega.name=Arduino Mega 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 +## Arduino Mega w/ ATmega2560 +## ------------------------- +mega.menu.cpu.atmega2560=ATmega2560 (Mega 2560) + +mega.menu.cpu.atmega2560.vid.0=0x2341 +mega.menu.cpu.atmega2560.pid.0=0x0010 +mega.menu.cpu.atmega2560.vid.1=0x2341 +mega.menu.cpu.atmega2560.pid.1=0x0042 + +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