From 5cde2e07d351412172e63b52267e6fb4739c7f56 Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Wed, 9 Oct 2013 17:13:37 +0200 Subject: [PATCH] Arduino Mega ADK will be activated automatically in Arduino 1.5.5 See: https://github.com/arduino/Arduino/pull/1605 --- README.md | 1 + avrpins.h | 2 +- settings.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e2ce776a..f282ce5c 100644 --- a/README.md +++ b/README.md @@ -74,6 +74,7 @@ Currently the following boards are supported by the library: The following boards need to be activated manually in [settings.h](settings.h): * Arduino Mega ADK + * If you are using Arduino 1.5.5 or newer there is no need to activate the Arduino Mega ADK manually * Black Widdow Simply set the corresponding value to 1 instead of 0. diff --git a/avrpins.h b/avrpins.h index 17f832b5..61ae5883 100644 --- a/avrpins.h +++ b/avrpins.h @@ -23,7 +23,7 @@ e-mail : support@circuitsathome.com #define _avrpins_h_ // Support for these boards needs to be manually activated in settings.h or in a makefile -#if !defined(BOARD_MEGA_ADK) && defined(__AVR_ATmega2560__) && USE_UHS_MEGA_ADK +#if !defined(BOARD_MEGA_ADK) && defined(__AVR_ATmega2560__) && (USE_UHS_MEGA_ADK || defined(ARDUINO_AVR_ADK)) #define BOARD_MEGA_ADK #elif !defined(BOARD_BLACK_WIDDOW) && USE_UHS_BLACK_WIDDOW #define BOARD_BLACK_WIDDOW diff --git a/settings.h b/settings.h index 40f97979..89a765f9 100644 --- a/settings.h +++ b/settings.h @@ -29,7 +29,7 @@ //////////////////////////////////////////////////////////////////////////////// /* Set this to 1 if you are using an Arduino Mega ADK board with MAX3421e built-in */ -#define USE_UHS_MEGA_ADK 0 +#define USE_UHS_MEGA_ADK 0 // If you are using Arduino 1.5.5 or newer there is no need to do this manually /* Set this to 1 if you are using a Black Widdow */ #define USE_UHS_BLACK_WIDDOW 0