mirrors
/
gattlib
mirror of https://github.com/labapart/gattlib
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
pull/116/head
Olivier Martin 2019-07-09 19:51:02 +02:00 committed by Olivier Martin
parent ebf3cc80fb
commit 0142c33dd8
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bluez/gattlib_connect.c
View File

@ -549,10 +549,12 @@ int get_handle_from_uuid(gatt_connection_t* connection, const uuid_t* uuid, uint
return -1; 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) int gattlib_get_rssi(gatt_connection_t *connection, int16_t *rssi)
{ {
return GATTLIB_NOT_SUPPORTED; return GATTLIB_NOT_SUPPORTED;
} }
#endif
int gattlib_get_rssi_from_mac(void *adapter, const char *mac_address, int16_t *rssi) int gattlib_get_rssi_from_mac(void *adapter, const char *mac_address, int16_t *rssi)
{ {

2
dbus/gattlib.c
View File

@ -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) int gattlib_get_rssi(gatt_connection_t *connection, int16_t *rssi)
{ {
gattlib_context_t* conn_context = connection->context; 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; return GATTLIB_SUCCESS;
} }
#endif
int gattlib_get_rssi_from_mac(void *adapter, const char *mac_address, int16_t *rssi) int gattlib_get_rssi_from_mac(void *adapter, const char *mac_address, int16_t *rssi)
{ {

13
gattlib-py/gattlib/device.py
View File

@ -53,12 +53,13 @@ class Device:
if self._connection == 0: if self._connection == 0:
raise DeviceError() raise DeviceError()
@property # Disable until https://github.com/labapart/gattlib/issues/75 is resolved
def rssi(self): # @property
_rssi = c_int16(0) # def rssi(self):
ret = gattlib_get_rssi(self._connection, byref(_rssi)) # _rssi = c_int16(0)
handle_return(ret) # ret = gattlib_get_rssi(self._connection, byref(_rssi))
return _rssi.value # handle_return(ret)
# return _rssi.value
@staticmethod @staticmethod
def on_disconnection(user_data): def on_disconnection(user_data):

2
include/gattlib.h
View File

@ -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_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); 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 * @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 * @return GATTLIB_SUCCESS on success or GATTLIB_* error code
*/ */
int gattlib_get_rssi(gatt_connection_t *connection, int16_t *rssi); int gattlib_get_rssi(gatt_connection_t *connection, int16_t *rssi);
#endif
/** /**
* @brief Function to retrieve RSSI from a MAC Address * @brief Function to retrieve RSSI from a MAC Address