Merge branch 'nordic_structure'

pull/235/head
Bogdan Marinescu 2014-03-26 15:30:26 +00:00
commit e35fd00101
120 changed files with 45 additions and 21 deletions

View File

@ -33,8 +33,8 @@
#include "pstorage.h"
#include "hw/GapEvents.h"
#include "hw/nRF51822n/nRF51Gap.h"
#include "hw/nRF51822n/nRF51GattServer.h"
#include "nRF51Gap.h"
#include "nRF51GattServer.h"
static void service_error_callback(uint32_t nrf_error);
void assert_nrf_callback(uint16_t line_num, const uint8_t * p_file_name);

View File

@ -25,8 +25,8 @@
#include "mbed.h"
#include "blecommon.h"
#include "hw/BLEDevice.h"
#include "hw/nRF51822n/nRF51Gap.h"
#include "hw/nRF51822n/nRF51GattServer.h"
#include "nRF51Gap.h"
#include "nRF51GattServer.h"
/**************************************************************************/
/*!

Some files were not shown because too many files have changed in this diff Show More