From 7a2332fa7d242cab7de4647e195ea3eaa6b21af2 Mon Sep 17 00:00:00 2001 From: Noel Eck Date: Fri, 8 Jun 2018 11:59:42 -0700 Subject: [PATCH] nrf8001: Updated to the mixed module init method A few small changes to the nrf8001 which exposes a bit more via SWIG. Also removed a method which had no implementation. Signed-off-by: Noel Eck --- src/nrf8001/CMakeLists.txt | 13 ++++++++----- src/nrf8001/hal_aci_tl.h | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/nrf8001/CMakeLists.txt b/src/nrf8001/CMakeLists.txt index 5ff23528..c1c195a7 100644 --- a/src/nrf8001/CMakeLists.txt +++ b/src/nrf8001/CMakeLists.txt @@ -1,5 +1,8 @@ -set (libname "nrf8001") -set (libdescription "Bluetooth Low Energy (BLE) Module") -set (module_src hal_aci_tl.cpp aci_setup.cpp aci_queue.cpp acilib.cpp lib_aci.cpp ${libname}.cxx) -set (module_hpp hal_aci_tl.h aci_setup.h aci_queue.h acilib.h lib_aci.h ${libname}.hpp) -upm_module_init(mraa) +upm_mixed_module_init (NAME nrf8001 + DESCRIPTION "Bluetooth Low Energy (BLE) Module" + CPP_HDR aci.h aci_cmds.h aci_evts.h acilib_defs.h acilib.h acilib_if.h + acilib_types.h aci_protocol_defines.h aci_queue.h aci_setup.h + boards.h dtm.h hal_aci_tl.h hal_platform.h lib_aci.h uart_over_ble.h + CPP_SRC acilib.cpp aci_queue.cpp aci_setup.cpp hal_aci_tl.cpp lib_aci.cpp + nrf8001.cxx + REQUIRES mraa) diff --git a/src/nrf8001/hal_aci_tl.h b/src/nrf8001/hal_aci_tl.h index e2299c3d..e2a12a6a 100644 --- a/src/nrf8001/hal_aci_tl.h +++ b/src/nrf8001/hal_aci_tl.h @@ -121,7 +121,7 @@ bool hal_aci_tl_send(hal_aci_data_t *aci_buffer); * that was pending. * @return Points to data buffer for received data. Length byte in buffer is 0 if no data received. */ -hal_aci_data_t * hal_aci_tl_poll_get(void); +//hal_aci_data_t * hal_aci_tl_poll_get(void); /** @brief Get an ACI event from the event queue * @details