Using Getting Started board. REmove old PSTR warning workarounds, unn…

…eeded in gcc >=4.6
nRF24 · Mar 26, 2012 · b8efa19 · b8efa19
1 parent 598e78c
commit b8efa19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/examples/meshping/meshping.pde b/examples/meshping/meshping.pde
@@ -38,20 +38,15 @@
 #include "nodeconfig.h"
 #include "printf.h"
 
-// Avoid spurious warnings
-#undef PROGMEM 
-#define PROGMEM __attribute__(( section(".progmem.data") )) 
-#undef PSTR 
-#define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); &__c[0];}))
-
 // This is for git version tracking.  Safe to ignore
 #ifdef VERSION_H
 #include "version.h"
 #else
 const char program_version[] = "Unknown";
 #endif
 
-RF24 radio(8,9);
+// nRF24L01(+) radio using the Getting Started board
+RF24 radio(9,10);
 RF24Network network(radio);
 
 // Our node address

diff --git a/examples/meshping/nodeconfig.cpp b/examples/meshping/nodeconfig.cpp
@@ -11,12 +11,6 @@
 #include <avr/pgmspace.h>
 #include "nodeconfig.h"
 
-// Avoid spurious warnings
-#undef PROGMEM 
-#define PROGMEM __attribute__(( section(".progmem.data") )) 
-#undef PSTR 
-#define PSTR(s) (__extension__({static prog_char __c[] PROGMEM = (s); &__c[0];}))
-
 // Where in EEPROM is the address stored?
 uint8_t* address_at_eeprom_location = (uint8_t*)10;