CreatBot/GeneralKlipperScreen
6
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

wifi: remove asyncio

Browse Source
This commit is contained in:
Jordan Ruthe 2021-02-18 11:59:59 -05:00
parent 0a25b4e502
commit 693c45e2d7
1 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ks_includes/wifi.py
View File

@ -1,9 +1,9 @@
import asyncio
import os, signal import os, signal
import json import json
import logging import logging
import re import re
import subprocess import subprocess
import threading
from contextlib import suppress from contextlib import suppress
from threading import Thread from threading import Thread
@ -28,6 +28,7 @@ class WifiManager(Thread):
"wpa2": re.compile(r"IE:\ IEEE\ 802\.11i/WPA2\ Version\ 1$") "wpa2": re.compile(r"IE:\ IEEE\ 802\.11i/WPA2\ Version\ 1$")
} }
connected = False connected = False
_stop_loop = False
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -38,34 +39,20 @@ class WifiManager(Thread):
self.read_wpa_supplicant() self.read_wpa_supplicant()
def run(self): def run(self):
event = threading.Event()
logger.debug("Setting up wifi event loop") logger.debug("Setting up wifi event loop")
self.loop = asyncio.new_event_loop() while self._stop_loop == False:
loop = self.loop
asyncio.set_event_loop(loop)
try: try:
self._poll_task = asyncio.ensure_future(self._poll()) self.scan()
loop.run_forever() event.wait(RESCAN_INTERVAL)
loop.run_until_complete(loop.shutdown_asyncgens()) except:
logger.exception("Poll wifi error")
self._poll_task.cancel()
with suppress(asyncio.CancelledError):
loop.run_until_complete(self._poll_task)
finally:
loop.close()
def stop(self): def stop(self):
self.loop.call_soon_threadsafe(self.loop.stop) self.loop.call_soon_threadsafe(self.loop.stop)
def stop_loop(self): def stop_loop(self):
loop.stop() self._stop_loop = True
async def _poll(self):
while True:
try:
await self.scan()
await asyncio.sleep(RESCAN_INTERVAL)
except:
logger.exception("Poll wifi error")
def get_current_wifi(self, interface="wlan0"): def get_current_wifi(self, interface="wlan0"):
p = subprocess.Popen(["iwconfig",interface], stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen(["iwconfig",interface], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@ -160,7 +147,7 @@ class WifiManager(Thread):
for network in networks: for network in networks:
self.networks_in_supplicant.append(network) self.networks_in_supplicant.append(network)
async def scan(self, interface='wlan0'): def scan(self, interface='wlan0'):
logger.debug("Scanning %s" % interface) logger.debug("Scanning %s" % interface)
p = subprocess.Popen(["sudo","iwlist",interface,"scan"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) p = subprocess.Popen(["sudo","iwlist",interface,"scan"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
aps = self.parse(p.stdout.read().decode('utf-8')) aps = self.parse(p.stdout.read().decode('utf-8'))