From b8efa19c6be1ecd8afb62dbb90ab20f89938ac5f Mon Sep 17 00:00:00 2001
From: maniacbug <maniacbug@ymail.com>
Date: Sun, 25 Mar 2012 19:37:17 -0700
Subject: [PATCH] Using Getting Started board.  REmove old PSTR warning
 workarounds, unneeded in gcc >=4.6

---
 examples/meshping/meshping.pde   | 9 ++-------
 examples/meshping/nodeconfig.cpp | 6 ------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/examples/meshping/meshping.pde b/examples/meshping/meshping.pde
index 2398fedd..abb53efc 100644
--- a/examples/meshping/meshping.pde
+++ b/examples/meshping/meshping.pde
@@ -38,12 +38,6 @@
 #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"
@@ -51,7 +45,8 @@
 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
index ac6e1fc2..3dfe19f6 100644
--- 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;