Commit 57a74e8c authored by Avamander's avatar Avamander Committed by GitHub

Merge pull request #251 from akatran/master

Changes in RF24_config.h prohibits the detection of XMEGA.
parents 9fa7d62a bdc74464
......@@ -1847,7 +1847,7 @@ private:
*
* The RF24 driver can be build as a static library with Atmel Studio 7 in order to be included as any other library in another program for the XMEGA family.
*
* Currently only the </b>ATXMEGA256D3</b> is implemented.
* Currently only the </b>ATXMEGA D3</b> family is implemented.
*
* @section Preparation
*
......@@ -1856,7 +1856,7 @@ private:
*
* @code
* utility\
* ATXMega256D3\
* ATXMegaD3\
* compatibility.c
* compatibility.h
* gpio.cpp
......
......@@ -28,8 +28,14 @@
#if defined SPI_HAS_TRANSACTION && !defined SPI_UART && !defined SOFTSPI
#define RF24_SPI_TRANSACTIONS
#endif
#if ( !defined (ARDUINO) ) // Any non-arduino device is handled via configure/Makefile
//ATXMega
#if defined(__AVR_ATxmega64D3__) || defined(__AVR_ATxmega128D3__) || defined(__AVR_ATxmega192D3__) || defined(__AVR_ATxmega256D3__) || defined(__AVR_ATxmega384D3__) // In order to be available both in windows and linux this should take presence here.
#define XMEGA
#define XMEGA_D3
#include "utility/ATXMegaD3/RF24_arch_config.h"
#elif ( !defined (ARDUINO) ) // Any non-arduino device is handled via configure/Makefile
// The configure script detects device and copies the correct includes.h file to /utility/includes.h
// This behavior can be overridden by calling configure with respective parameters
......@@ -41,11 +47,7 @@
#define RF24_TINY
#include "utility/ATTiny/RF24_arch_config.h"
//ATXMega
#elif defined(__AVR_ATxmega256D3__)
#define XMEGA
#define XMEGA_D3
#include "utility/ATXMegaD3/RF24_arch_config.h"
//LittleWire
#elif defined(LITTLEWIRE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment