Skip to content

Commit

Permalink
Merge pull request #251 from akatran/master
Browse files Browse the repository at this point in the history
Changes in RF24_config.h prohibits the detection of XMEGA.
  • Loading branch information
Avamander authored Jun 16, 2016
2 parents 9fa7d62 + bdc7446 commit 57a74e8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions RF24.h
Original file line number Diff line number Diff line change
Expand Up @@ -1847,7 +1847,7 @@ s *
*
* 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
*
Expand All @@ -1856,7 +1856,7 @@ s *
*
* @code
* utility\
* ATXMega256D3\
* ATXMegaD3\
* compatibility.c
* compatibility.h
* gpio.cpp
Expand Down
16 changes: 9 additions & 7 deletions RF24_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand Down

0 comments on commit 57a74e8

Please sign in to comment.