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

nrf5/modules: Moving includes inside config defines to make non-ubluepy targets compile again.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-02-15 00:26:39 +01:00
parent b493bfda64
commit 8d1b05563c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nrf5/modules/ubluepy/ubluepy_service.c
View File

@ -24,13 +24,14 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#if MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
#include "py/obj.h" #include "py/obj.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "modubluepy.h" #include "modubluepy.h"
#include "softdevice.h" #include "softdevice.h"
#if MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
STATIC void ubluepy_service_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) { STATIC void ubluepy_service_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
ubluepy_service_obj_t * self = (ubluepy_service_obj_t *)o; ubluepy_service_obj_t * self = (ubluepy_service_obj_t *)o;

4
nrf5/modules/ubluepy/ubluepy_uuid.c
View File

@ -24,6 +24,8 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#if MICROPY_PY_UBLUEPY
#include "py/obj.h" #include "py/obj.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/objstr.h" #include "py/objstr.h"
@ -32,8 +34,6 @@
#include "modubluepy.h" #include "modubluepy.h"
#include "softdevice.h" #include "softdevice.h"
#if MICROPY_PY_UBLUEPY
STATIC void ubluepy_uuid_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) { STATIC void ubluepy_uuid_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
ubluepy_uuid_obj_t * self = (ubluepy_uuid_obj_t *)o; ubluepy_uuid_obj_t * self = (ubluepy_uuid_obj_t *)o;
if (self->type == UBLUEPY_UUID_16_BIT) { if (self->type == UBLUEPY_UUID_16_BIT) {