Skip to content

Commit b7f4f3c

Browse files
committed
Revert "Add device_getter argument to init."
This reverts commit 736d760.
1 parent 736d760 commit b7f4f3c

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

cometblue_lite/cometblue.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,10 @@ def all_temperatures_none(self):
254254
class CometBlue:
255255
"""CometBlue Thermostat """
256256

257-
def __init__(self, address, pin, device_getter=None):
257+
def __init__(self, address, pin):
258258
super(CometBlue, self).__init__()
259259
self._address = address
260260
self._device: BLEDevice | None = None
261-
self._get_device = device_getter
262261
self._pin = pin
263262
self.available = False
264263
self._handles = dict()
@@ -274,8 +273,6 @@ def __init__(self, address, pin, device_getter=None):
274273
self._expected_disconnect = False
275274
self.loop = asyncio.get_event_loop()
276275
# btle.Debugging = True
277-
278-
279276
async def _ensure_connected(self):
280277
"""Ensure connection to device is established."""
281278
if self._connect_lock.locked():
@@ -293,14 +290,11 @@ async def _ensure_connected(self):
293290
return
294291
_LOGGER.debug("%s: Connecting; ", self._address)
295292
if self._device is None:
296-
if self._get_device is None:
293+
self._device = await BleakScanner.find_device_by_address(self._address, 60.0)
294+
if self._device is None:
297295
self._device = await BleakScanner.find_device_by_address(self._address, 60.0)
298296
if self._device is None:
299297
raise Exception("could not discover device")
300-
else:
301-
self._device = self._get_device(self._address)
302-
if self._device is None:
303-
raise Exception("could not discover device")
304298

305299
client = await establish_connection(
306300
BleakClientWithServiceCache,

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
setup(
55
name='cometblue_lite',
6-
version='0.6.0',
6+
version='0.5.3',
77
packages=['cometblue_lite'],
88
python_requires='>=3.4',
9-
install_requires=['bleak_retry_connector>=1.8.0', 'bleak>=0.17.0'],
9+
install_requires=['bleak_retry_connector>=1.8.0', 'bleak>=0.15.1'],
1010
description='Module for Eurotronic Comet Blue thermostats',
1111
author='David Kreitschmann',
1212
maintainer='David Kreitschmann',

0 commit comments

Comments
 (0)