Merge pull request #55 from ketile/Issue-#14

Fix for issue #14
NordicSemiconductor · Feb 27, 2015 · 0f720b6 · 0f720b6
2 parents 3738c99 + aae4652
commit 0f720b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/libraries/BLE/examples/ble_A_Hello_World_Program/ble_A_Hello_World_Program.ino b/libraries/BLE/examples/ble_A_Hello_World_Program/ble_A_Hello_World_Program.ino
@@ -84,7 +84,7 @@ However this removes the need to do the setup of the nRF8001 on every reset.
 #endif
 
 /* Store the setup for the nRF8001 in the flash of the AVR to save on RAM */
-static hal_aci_data_t setup_msgs[NB_SETUP_MESSAGES] PROGMEM = SETUP_MESSAGES_CONTENT;
+static const hal_aci_data_t setup_msgs[NB_SETUP_MESSAGES] PROGMEM = SETUP_MESSAGES_CONTENT;
 
 // aci_struct that will contain
 // total initial credits
@@ -174,7 +174,7 @@ void setup(void)
     aci_state.aci_setup_info.services_pipe_type_mapping = NULL;
   }
   aci_state.aci_setup_info.number_of_pipes    = NUMBER_OF_PIPES;
-  aci_state.aci_setup_info.setup_msgs         = setup_msgs;
+  aci_state.aci_setup_info.setup_msgs         = (hal_aci_data_t*)setup_msgs;
   aci_state.aci_setup_info.num_setup_msgs     = NB_SETUP_MESSAGES;
 
   /*

diff --git a/libraries/BLE/hal_platform.h b/libraries/BLE/hal_platform.h
@@ -31,10 +31,7 @@
     //For Arduino this AVR specific library has to be used for reading from Flash memory
     #include <avr/pgmspace.h>
     #include "Arduino.h"
-    #ifdef PROGMEM
-        #undef PROGMEM
-        #define PROGMEM __attribute__(( section(".progmem.data") ))
-	    #endif
+
 #elif defined(__PIC32MX__)
     //For Chipkit add the following libraries.
     #include <stdint.h>