From bc0c31dc723a94c0916aaa10cbb0354538261df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Inge=20Hanssen?= Date: Fri, 14 Feb 2020 14:12:23 +0100 Subject: [PATCH 1/3] Bump version to 0.14.1 (#155) --- pc_ble_driver_py/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pc_ble_driver_py/__init__.py b/pc_ble_driver_py/__init__.py index 80f16255..8ed26895 100755 --- a/pc_ble_driver_py/__init__.py +++ b/pc_ble_driver_py/__init__.py @@ -39,4 +39,4 @@ """ -__version__ = "0.14.0" +__version__ = "0.14.1" From 9a21d9eb09887efeac0ab9fe54f65f6116928af3 Mon Sep 17 00:00:00 2001 From: Halvor Date: Fri, 14 Feb 2020 14:46:03 +0100 Subject: [PATCH 2/3] Add connectivity firmware zip to build (#156) --- CMakeLists.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 401670e7..e1be86f1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,7 +107,7 @@ foreach(SD_API_VER ${SD_API_VERS}) get_target_property(CONNECTIVITY_SD_API_V${SD_API_VER}_PATH nrf::nrf_ble_driver_sd_api_v${SD_API_VER}_${NRF_BLE_DRIVER_LINKAGE_TYPE} INTERFACE_INCLUDE_DIRECTORIES) set(CONNECTIVITY_SD_API_V${SD_API_VER}_PATH ${CONNECTIVITY_SD_API_V${SD_API_VER}_PATH}/../../share/nrf-ble-driver/hex/sd_api_v${SD_API_VER}) - file(GLOB_RECURSE CONNECTIVITY_SD_API_V${SD_API_VER}_FILES "${CONNECTIVITY_SD_API_V${SD_API_VER}_PATH}/*.hex") + file(GLOB_RECURSE CONNECTIVITY_SD_API_V${SD_API_VER}_FILES "${CONNECTIVITY_SD_API_V${SD_API_VER}_PATH}/*.hex" "${CONNECTIVITY_SD_API_V${SD_API_VER}_PATH}/*.zip") set_property( TARGET ${PYTHON_MODULE_${SD_API_VER}} diff --git a/setup.py b/setup.py index 627114f3..2faa4b2b 100644 --- a/setup.py +++ b/setup.py @@ -126,6 +126,6 @@ def find_version(*file_paths): 'pc_ble_driver_py.lib': ['*.pyd', '*.dll', '*.txt','*.so','*.dylib'], 'pc_ble_driver_py.hex': ['*.hex'], 'pc_ble_driver_py.hex.sd_api_v2': ['*.hex'], - 'pc_ble_driver_py.hex.sd_api_v5': ['*.hex'] + 'pc_ble_driver_py.hex.sd_api_v5': ['*.hex', '*.zip'] } ) From 98b8a2eec91106c3475cd93b47a4f2ebbc3c9704 Mon Sep 17 00:00:00 2001 From: Ryan Lindeman Date: Fri, 14 Feb 2020 06:49:25 -0700 Subject: [PATCH 3/3] Add offset parameter to ble_adapter.py read_req (#154) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bjørn Inge Hanssen --- pc_ble_driver_py/ble_adapter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc_ble_driver_py/ble_adapter.py b/pc_ble_driver_py/ble_adapter.py index 0b06f976..164d593a 100644 --- a/pc_ble_driver_py/ble_adapter.py +++ b/pc_ble_driver_py/ble_adapter.py @@ -468,11 +468,11 @@ def write_exec(self, conn_handle): result = self.evt_sync[conn_handle].wait(evt=BLEEvtID.gattc_evt_write_rsp) return result["status"] - def read_req(self, conn_handle, uuid): + def read_req(self, conn_handle, uuid, offset=0): handle = self.db_conns[conn_handle].get_char_value_handle(uuid) if handle is None: raise NordicSemiException("Characteristic value handler not found") - self.driver.ble_gattc_read(conn_handle, handle, 0) + self.driver.ble_gattc_read(conn_handle, handle, offset) result = self.evt_sync[conn_handle].wait(evt=BLEEvtID.gattc_evt_read_rsp) gatt_res = result["status"] if gatt_res == BLEGattStatusCode.success: