From 0142c33dd8fd1a094ea0a4d5ac19af86eee8cae7 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Tue, 9 Jul 2019 19:51:02 +0200 Subject: [PATCH] gattlib: Disable gattlib_get_rssi() for now This API has been disabled until this issue is clarified: https://github.com/labapart/gattlib/issues/75 RSSI can be accessed through `gattlib_get_rssi_from_mac()` before the connection is established. --- bluez/gattlib_connect.c | 2 ++ dbus/gattlib.c | 2 ++ gattlib-py/gattlib/device.py | 13 +++++++------ include/gattlib.h | 2 ++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/bluez/gattlib_connect.c b/bluez/gattlib_connect.c index f828695..44a572b 100644 --- a/bluez/gattlib_connect.c +++ b/bluez/gattlib_connect.c @@ -549,10 +549,12 @@ int get_handle_from_uuid(gatt_connection_t* connection, const uuid_t* uuid, uint return -1; } +#if 0 // Disable until https://github.com/labapart/gattlib/issues/75 is resolved int gattlib_get_rssi(gatt_connection_t *connection, int16_t *rssi) { return GATTLIB_NOT_SUPPORTED; } +#endif int gattlib_get_rssi_from_mac(void *adapter, const char *mac_address, int16_t *rssi) { diff --git a/dbus/gattlib.c b/dbus/gattlib.c index 70dfbbe..cd7ff60 100644 --- a/dbus/gattlib.c +++ b/dbus/gattlib.c @@ -1365,6 +1365,7 @@ int gattlib_notification_stop(gatt_connection_t* connection, const uuid_t* uuid) } } +#if 0 // Disable until https://github.com/labapart/gattlib/issues/75 is resolved int gattlib_get_rssi(gatt_connection_t *connection, int16_t *rssi) { gattlib_context_t* conn_context = connection->context; @@ -1377,6 +1378,7 @@ int gattlib_get_rssi(gatt_connection_t *connection, int16_t *rssi) return GATTLIB_SUCCESS; } +#endif int gattlib_get_rssi_from_mac(void *adapter, const char *mac_address, int16_t *rssi) { diff --git a/gattlib-py/gattlib/device.py b/gattlib-py/gattlib/device.py index 16771a3..111bd04 100644 --- a/gattlib-py/gattlib/device.py +++ b/gattlib-py/gattlib/device.py @@ -53,12 +53,13 @@ class Device: if self._connection == 0: raise DeviceError() - @property - def rssi(self): - _rssi = c_int16(0) - ret = gattlib_get_rssi(self._connection, byref(_rssi)) - handle_return(ret) - return _rssi.value + # Disable until https://github.com/labapart/gattlib/issues/75 is resolved +# @property +# def rssi(self): +# _rssi = c_int16(0) +# ret = gattlib_get_rssi(self._connection, byref(_rssi)) +# handle_return(ret) +# return _rssi.value @staticmethod def on_disconnection(user_data): diff --git a/include/gattlib.h b/include/gattlib.h index c6a473c..bc00f1f 100644 --- a/include/gattlib.h +++ b/include/gattlib.h @@ -357,6 +357,7 @@ int gattlib_notification_stop(gatt_connection_t* connection, const uuid_t* uuid) void gattlib_register_notification(gatt_connection_t* connection, gattlib_event_handler_t notification_handler, void* user_data); void gattlib_register_indication(gatt_connection_t* connection, gattlib_event_handler_t indication_handler, void* user_data); +#if 0 // Disable until https://github.com/labapart/gattlib/issues/75 is resolved /** * @brief Function to retrieve RSSI from a GATT connection * @@ -366,6 +367,7 @@ void gattlib_register_indication(gatt_connection_t* connection, gattlib_event_ha * @return GATTLIB_SUCCESS on success or GATTLIB_* error code */ int gattlib_get_rssi(gatt_connection_t *connection, int16_t *rssi); +#endif /** * @brief Function to retrieve RSSI from a MAC Address