fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

tests/multi_bluetooth: Make ble_gap_connect robust against event timing.

Browse Source
This commit is contained in:
Jim Mussared 2020-08-31 15:54:20 +10:00 committed by Damien George
parent 0f28020a68
commit 5eda362e0a
2 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
tests/multi_bluetooth/ble_gap_connect.py
View File

@ -10,35 +10,36 @@ _IRQ_CENTRAL_DISCONNECT = const(2)
_IRQ_PERIPHERAL_CONNECT = const(7) _IRQ_PERIPHERAL_CONNECT = const(7)
_IRQ_PERIPHERAL_DISCONNECT = const(8) _IRQ_PERIPHERAL_DISCONNECT = const(8)
waiting_event = None central_connected = False
waiting_data = None central_disconnected = False
peripheral_connected = False
peripheral_disconnected = False
conn_handle = None
def irq(event, data): def irq(event, data):
global waiting_event, waiting_data global central_connected, central_disconnected, peripheral_connected, peripheral_disconnected, conn_handle
if event == _IRQ_CENTRAL_CONNECT: if event == _IRQ_CENTRAL_CONNECT:
print("_IRQ_CENTRAL_CONNECT") print("_IRQ_CENTRAL_CONNECT")
central_connected = True
conn_handle = data[0]
elif event == _IRQ_CENTRAL_DISCONNECT: elif event == _IRQ_CENTRAL_DISCONNECT:
print("_IRQ_CENTRAL_DISCONNECT") print("_IRQ_CENTRAL_DISCONNECT")
central_disconnected = True
elif event == _IRQ_PERIPHERAL_CONNECT: elif event == _IRQ_PERIPHERAL_CONNECT:
print("_IRQ_PERIPHERAL_CONNECT") print("_IRQ_PERIPHERAL_CONNECT")
peripheral_connected = True
conn_handle = data[0]
elif event == _IRQ_PERIPHERAL_DISCONNECT: elif event == _IRQ_PERIPHERAL_DISCONNECT:
print("_IRQ_PERIPHERAL_DISCONNECT") print("_IRQ_PERIPHERAL_DISCONNECT")
peripheral_disconnected = True
if waiting_event is not None: remote_addr = data[0]
if event == waiting_event:
waiting_event = None
waiting_data = data
def wait_for_event(event, timeout_ms): def wait_for(fn, timeout_ms):
global waiting_event, waiting_data
waiting_event = event
waiting_data = None
t0 = time.ticks_ms() t0 = time.ticks_ms()
while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms: while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
if waiting_data: if fn():
return True return True
machine.idle() machine.idle()
return False return False
@ -46,25 +47,31 @@ def wait_for_event(event, timeout_ms):
# Acting in peripheral role. # Acting in peripheral role.
def instance0(): def instance0():
global central_connected, central_disconnected
multitest.globals(BDADDR=ble.config("mac")) multitest.globals(BDADDR=ble.config("mac"))
print("gap_advertise") print("gap_advertise")
ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY") ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
multitest.next() multitest.next()
try: try:
# Wait for central to connect, then wait for it to disconnect. # Wait for central to connect, then wait for it to disconnect.
if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS): if not wait_for(lambda: central_connected, TIMEOUT_MS):
return return
if not wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS): if not wait_for(lambda: central_disconnected, TIMEOUT_MS):
return return
central_connected = False
central_disconnected = False
# Start advertising again. # Start advertising again.
print("gap_advertise")
ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY") ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
# Wait for central to connect, then disconnect it. # Wait for central to connect, then disconnect it.
if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS): if not wait_for(lambda: central_connected, TIMEOUT_MS):
return return
print("gap_disconnect:", ble.gap_disconnect(waiting_data[0])) print("gap_disconnect:", ble.gap_disconnect(conn_handle))
if not wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS): if not wait_for(lambda: central_disconnected, TIMEOUT_MS):
return return
finally: finally:
ble.active(0) ble.active(0)
@ -72,26 +79,32 @@ def instance0():
# Acting in central role. # Acting in central role.
def instance1(): def instance1():
global peripheral_connected, peripheral_disconnected
multitest.next() multitest.next()
try: try:
# Connect to peripheral and then disconnect. # Connect to peripheral and then disconnect.
print("gap_connect") print("gap_connect")
ble.gap_connect(*BDADDR) ble.gap_connect(*BDADDR)
if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS): if not wait_for(lambda: peripheral_connected, TIMEOUT_MS):
return return
print("gap_disconnect:", ble.gap_disconnect(waiting_data[0])) print("gap_disconnect:", ble.gap_disconnect(conn_handle))
if not wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS): if not wait_for(lambda: peripheral_disconnected, TIMEOUT_MS):
return return
peripheral_connected = False
peripheral_disconnected = False
# Wait for peripheral to start advertising again. # Wait for peripheral to start advertising again.
time.sleep_ms(100) time.sleep_ms(100)
# Connect to peripheral and then let the peripheral disconnect us. # Connect to peripheral and then let the peripheral disconnect us.
print("gap_connect") print("gap_connect")
ble.gap_connect(*BDADDR) ble.gap_connect(*BDADDR)
if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS): if not wait_for(lambda: peripheral_connected, TIMEOUT_MS):
return
if not wait_for(lambda: peripheral_disconnected, TIMEOUT_MS):
return return
wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
finally: finally:
ble.active(0) ble.active(0)

1
tests/multi_bluetooth/ble_gap_connect.py.exp
View File

@ -2,6 +2,7 @@
gap_advertise gap_advertise
_IRQ_CENTRAL_CONNECT _IRQ_CENTRAL_CONNECT
_IRQ_CENTRAL_DISCONNECT _IRQ_CENTRAL_DISCONNECT
gap_advertise
_IRQ_CENTRAL_CONNECT _IRQ_CENTRAL_CONNECT
gap_disconnect: True gap_disconnect: True
_IRQ_CENTRAL_DISCONNECT _IRQ_CENTRAL_DISCONNECT