Skip to content

Commit 8495ecd

Browse files
committed
Fix a few async related bugs
1 parent be233b2 commit 8495ecd

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.pyc

custom_components/jablotron80/jablotron.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,7 @@ def formatted_by(self) -> str:
529529
return f"Device {self._by._id}, {self._by.name}"
530530
elif isinstance(self._by, JablotronCode):
531531
return f"Code {self._by._id}, {self._by.name}"
532+
return "Unknown instance"
532533

533534
@property
534535
def type(self):
@@ -2615,7 +2616,7 @@ async def return_mode(self) -> None:
26152616
LOGGER.warning(f"Trying to enter normal mode but state is {self.last_state}")
26162617

26172618
async def read_settings(self) -> bool:
2618-
if self.enter_elevated_mode(self._master_code):
2619+
if await self.enter_elevated_mode(self._master_code):
26192620
result = await self.send_settings_command()
26202621
await self.send_return_mode_command()
26212622
return result
@@ -2659,7 +2660,7 @@ async def disarm(self, code: str, zone: str = None) -> None:
26592660
await self.send_keypress_sequence(code, b"\xa2")
26602661
if JablotronState.is_alarm_state(self._last_state):
26612662
# confirm alarm
2662-
self.send_detail_command
2663+
await self.send_detail_command()
26632664

26642665
async def processing_loop(self) -> None:
26652666
previous_record = None
@@ -2695,9 +2696,10 @@ async def status_loop(self) -> None:
26952696
{CONFIGURATION_SERIAL_PORT: "/dev/hidraw0", CONFIGURATION_PASSWORD: "1234"},
26962697
)
26972698
loop = asyncio.get_event_loop()
2698-
loop.create_task(cu.processing_loop())
2699-
loop.create_task(cu.status_loop())
2700-
loop.create_task(cu.read_settings())
2699+
background_tasks = set()
2700+
background_tasks.add(loop.create_task(cu.processing_loop()))
2701+
background_tasks.add(loop.create_task(cu.status_loop()))
2702+
background_tasks.add(loop.create_task(cu.read_settings()))
27012703
# loop.create_task(cu.status_loop())
27022704
from concurrent.futures import ThreadPoolExecutor
27032705

0 commit comments

Comments
 (0)