Update from TMRh20/master and merge with local.

ef70a4fe · akatran · 9e717722 · ef70a4fe
Commit ef70a4fe authored Apr 02, 2016 by akatran
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

RF24_config.h RF24_config.h +2 -1

No files found.
--- 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