Update from TMRh20/master and merge with local.

nRF24 · Apr 2, 2016 · ef70a4f · ef70a4f
1 parent 9e71772
commit ef70a4f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/RF24_config.h b/RF24_config.h
@@ -44,6 +44,7 @@
 
 //ATXMega
 #elif defined(__AVR_ATxmega256D3__)
+  #define XMEGA
   #define XMEGA_D3
   #include "utility/ATXMegaD3/RF24_arch_config.h"
 //LittleWire  
@@ -129,7 +130,7 @@
   #define pgm_read_word(p) (*(p))
   #define PRIPSTR "%s"
 
-#elif defined(ARDUINO) && ! defined(__arm__) && !defined (__ARDUINO_X86__)
+#elif defined(ARDUINO) && ! defined(__arm__) && !defined (__ARDUINO_X86__) && defined(XMEGA)
 	#include <avr/pgmspace.h>
 	#define PRIPSTR "%S"
 #else