Skip to content
This repository has been archived by the owner on Feb 19, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into release/0.14
Browse files Browse the repository at this point in the history
  • Loading branch information
halkver authored Feb 14, 2020
2 parents 0b854f8 + 98b8a2e commit 4d325a4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
3 changes: 2 additions & 1 deletion pc_ble_driver_py/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@
"""

__version__ = "0.14.2"

__version__ = "0.14.2"
4 changes: 2 additions & 2 deletions pc_ble_driver_py/ble_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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']
}
)

0 comments on commit 4d325a4

Please sign in to comment.