Merge branch 'master' of https://github.com/mysensors/Arduino.git

tbowmo · Sep 4, 2015 · 06bd5c3 · 06bd5c3
2 parents c08dcaf + 9a32c2c
commit 06bd5c3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/libraries/MySensors/utility/RF24.cpp b/libraries/MySensors/utility/RF24.cpp
@@ -548,13 +548,17 @@ void RF24::startListening(void)
 /****************************************************************************/
 static uint8_t get_child_pipe_mask(const uint8_t idx)
 {
-  static const uint8_t child_pipe_enable[] PROGMEM =
+#ifdef ESP8266
+  static const uint8_t child_pipe_enable[] =
   {
     _BV(ERX_P0), _BV(ERX_P1), _BV(ERX_P2), _BV(ERX_P3), _BV(ERX_P4), _BV(ERX_P5)
   };
-#ifdef ESP8266
   return child_pipe_enable[idx];
 #else
+  static const uint8_t child_pipe_enable[] PROGMEM =
+  {
+    _BV(ERX_P0), _BV(ERX_P1), _BV(ERX_P2), _BV(ERX_P3), _BV(ERX_P4), _BV(ERX_P5)
+  };
   return pgm_read_byte(&child_pipe_enable[idx]);
 #endif
 }