Skip to content

GitLab

R
RF24
Commit ef70a4fe authored by akatran's avatar akatran
Browse files
Options

Update from TMRh20/master and merge with local.

parent 9e717722
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
RF24_config.h
View file @ ef70a4fe
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
//ATXMega //ATXMega
#elif defined(__AVR_ATxmega256D3__) #elif defined(__AVR_ATxmega256D3__)
#define XMEGA
#define XMEGA_D3 #define XMEGA_D3
#include "utility/ATXMegaD3/RF24_arch_config.h" #include "utility/ATXMegaD3/RF24_arch_config.h"
//LittleWire //LittleWire
...@@ -129,7 +130,7 @@ ...@@ -129,7 +130,7 @@
#define pgm_read_word(p) (*(p)) #define pgm_read_word(p) (*(p))
#define PRIPSTR "%s" #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> #include <avr/pgmspace.h>
#define PRIPSTR "%S" #define PRIPSTR "%S"
#else #else
......
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