|
@@ -21,7 +21,7 @@ class StateScan:
|
21
|
21
|
if self.lock.locked():
|
22
|
22
|
self.lock.release()
|
23
|
23
|
|
24
|
|
- return self.results[self.current]
|
|
24
|
+ return self.results[self.current][4]
|
25
|
25
|
|
26
|
26
|
async def scan(self):
|
27
|
27
|
while True:
|
|
@@ -31,7 +31,7 @@ class StateScan:
|
31
|
31
|
name = n.name()
|
32
|
32
|
mac = n.device.addr_hex()
|
33
|
33
|
rssi = n.rssi
|
34
|
|
- value = [name, mac, rssi, time.time()]
|
|
34
|
+ value = [name, mac, rssi, time.time(), n]
|
35
|
35
|
|
36
|
36
|
async with self.lock:
|
37
|
37
|
found = False
|
|
@@ -41,6 +41,7 @@ class StateScan:
|
41
|
41
|
self.results[i][0] = name
|
42
|
42
|
self.results[i][2] = rssi
|
43
|
43
|
self.results[i][3] = time.time()
|
|
44
|
+ self.results[i][4] = n
|
44
|
45
|
break
|
45
|
46
|
|
46
|
47
|
if found == False:
|
|
@@ -48,7 +49,7 @@ class StateScan:
|
48
|
49
|
|
49
|
50
|
def draw_list(self):
|
50
|
51
|
for i, d in enumerate(self.results):
|
51
|
|
- name, mac, rssi, timeout = self.results[i]
|
|
52
|
+ name, mac, rssi, timeout, device = self.results[i]
|
52
|
53
|
s1 = "{}: {}".format(i + 1, name)
|
53
|
54
|
s2 = "[{}] {}".format(mac, rssi)
|
54
|
55
|
|