djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf: Fix BLE on nRF52840 after adding the USB functionality

Browse Source
This commit is contained in:
arturo182 2018-07-13 14:51:50 +02:00
parent 75f48a5bc7
commit 9729fc3d31
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/nrf/drivers/bluetooth/ble_drv.c
View File

@ -30,12 +30,15 @@
#include <string.h> #include <string.h>
#include <stdbool.h> #include <stdbool.h>
#if (BLUETOOTH_SD == 132)
#define NRF52 // Needed for SD132 v2 #define NRF52 // Needed for SD132 v2
#endif
#include "py/runtime.h" #include "py/runtime.h"
#include "ble_drv.h" #include "ble_drv.h"
#include "mpconfigport.h" #include "mpconfigport.h"
#include "nrf_sdm.h" #include "nrf_sdm.h"
#include "nrfx_power.h"
#include "ble_gap.h" #include "ble_gap.h"
#include "ble.h" // sd_ble_uuid_encode #include "ble.h" // sd_ble_uuid_encode
@ -142,6 +145,12 @@ uint32_t ble_drv_stack_enable(void) {
#endif #endif
}; };
#endif #endif
#if (BLUETOOTH_SD == 140)
// The SD takes over the POWER IRQ and will fail if the IRQ is already in use
nrfx_power_uninit();
#endif
uint32_t err_code = sd_softdevice_enable(&clock_config, uint32_t err_code = sd_softdevice_enable(&clock_config,
softdevice_assert_handler); softdevice_assert_handler);