|
@@ -2,6 +2,7 @@
|
2
|
2
|
|
3
|
3
|
import uasyncio as asyncio
|
4
|
4
|
from scan import ble_scan
|
|
5
|
+import time
|
5
|
6
|
|
6
|
7
|
class StateScan:
|
7
|
8
|
def __init__(self, lcd):
|
|
@@ -30,7 +31,7 @@ class StateScan:
|
30
|
31
|
name = n.name()
|
31
|
32
|
mac = n.device.addr_hex()
|
32
|
33
|
rssi = n.rssi
|
33
|
|
- value = [name, mac, rssi]
|
|
34
|
+ value = [name, mac, rssi, time.time()]
|
34
|
35
|
|
35
|
36
|
async with self.lock:
|
36
|
37
|
found = False
|
|
@@ -39,6 +40,7 @@ class StateScan:
|
39
|
40
|
found = True
|
40
|
41
|
self.results[i][0] = name
|
41
|
42
|
self.results[i][2] = rssi
|
|
43
|
+ self.results[i][3] = time.time()
|
42
|
44
|
break
|
43
|
45
|
|
44
|
46
|
if found == False:
|
|
@@ -46,7 +48,7 @@ class StateScan:
|
46
|
48
|
|
47
|
49
|
def draw_list(self):
|
48
|
50
|
for i, d in enumerate(self.results):
|
49
|
|
- name, mac, rssi = self.results[i]
|
|
51
|
+ name, mac, rssi, timeout = self.results[i]
|
50
|
52
|
s1 = "{}: {}".format(i + 1, name)
|
51
|
53
|
s2 = "[{}] {}".format(mac, rssi)
|
52
|
54
|
|
|
@@ -89,6 +91,12 @@ class StateScan:
|
89
|
91
|
elif self.current < (len(self.results) - 1):
|
90
|
92
|
self.current += 1
|
91
|
93
|
|
|
94
|
+ # remove entries after timeout
|
|
95
|
+ self.results = [x for x in self.results if (time.time() - x[3]) < 10.0]
|
|
96
|
+ if self.current != None:
|
|
97
|
+ if self.current >= len(self.results):
|
|
98
|
+ self.current = len(self.results) - 1
|
|
99
|
+
|
92
|
100
|
self.draw_list()
|
93
|
101
|
|
94
|
102
|
return -1
|