From 49bd9cb515fbbafce71860436783f2596dd241d9 Mon Sep 17 00:00:00 2001 From: Ian McEwen Date: Sun, 30 Jun 2024 23:40:11 -0700 Subject: [PATCH 1/2] Support --ble on older firmwares that don't have the log-radio characteristic yet. --- meshtastic/ble_interface.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/meshtastic/ble_interface.py b/meshtastic/ble_interface.py index b5f9f7d..c57930a 100644 --- a/meshtastic/ble_interface.py +++ b/meshtastic/ble_interface.py @@ -56,7 +56,8 @@ class BLEInterface(MeshInterface): self.close() raise e - self.client.start_notify(LOGRADIO_UUID, self.log_radio_handler) + if self.client.has_characteristic(LOGRADIO_UUID): + self.client.start_notify(LOGRADIO_UUID, self.log_radio_handler) logging.debug("Mesh configure starting") self._startConfig() @@ -248,6 +249,12 @@ class BLEClient: def write_gatt_char(self, *args, **kwargs): # pylint: disable=C0116 self.async_await(self.bleak_client.write_gatt_char(*args, **kwargs)) + def has_characteristic(self, specifier): + if self.bleak_client.services.get_characteristic(specifier): + return True + else: + return False + def start_notify(self, *args, **kwargs): # pylint: disable=C0116 self.async_await(self.bleak_client.start_notify(*args, **kwargs)) From 3b4690e93299731f214153ad36f0ff6f3da2e5c5 Mon Sep 17 00:00:00 2001 From: Ian McEwen Date: Mon, 1 Jul 2024 00:00:59 -0700 Subject: [PATCH 2/2] appease the linter --- meshtastic/ble_interface.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meshtastic/ble_interface.py b/meshtastic/ble_interface.py index c57930a..885502f 100644 --- a/meshtastic/ble_interface.py +++ b/meshtastic/ble_interface.py @@ -250,10 +250,8 @@ class BLEClient: self.async_await(self.bleak_client.write_gatt_char(*args, **kwargs)) def has_characteristic(self, specifier): - if self.bleak_client.services.get_characteristic(specifier): - return True - else: - return False + """Check if the connected node supports a specified characteristic.""" + return bool(self.bleak_client.services.get_characteristic(specifier)) def start_notify(self, *args, **kwargs): # pylint: disable=C0116 self.async_await(self.bleak_client.start_notify(*args, **kwargs))