Commit cb68ebb

committed

aioble: Pass additional connection arguments to gap_connect.

This allows the following arguments to be passed to `device.connect()`: * scan_duration_ms * min_conn_interval_us * max_conn_interval_us These are passed as-is to `gap_connect()`. The default value for all of these is `None`, which causes gap_connect to use its own defaults. Signed-off-by: Joris van der Wel <joris@jorisvanderwel.com>

1 parent 60d1370 commit cb68ebbCopy full SHA for cb68ebb

File tree

2 files changed

+24

-4

lines changed

micropython/bluetooth/aioble/aioble
- central.py
- device.py

2 files changed

+24

-4

lines changed

`‎micropython/bluetooth/aioble/aioble/central.py‎`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,9 @@ async def _cancel_pending():`
`104`	`104`
`105`	`105`	`# Start connecting to a peripheral.`
`106`	`106`	`# Call device.connect() rather than using method directly.`
`107`		`-async def _connect(connection, timeout_ms):`
	`107`	`+async def _connect(`
	`108`	`+ connection, timeout_ms, scan_duration_ms, min_conn_interval_us, max_conn_interval_us`
	`109`	`+):`
`108`	`110`	`device = connection.device`
`109`	`111`	`if device in _connecting:`
`110`	`112`	`return`
`@@ -122,7 +124,13 @@ async def _connect(connection, timeout_ms):`
`122`	`124`
`123`	`125`	`try:`
`124`	`126`	`with DeviceTimeout(None, timeout_ms):`
`125`		`- ble.gap_connect(device.addr_type, device.addr)`
	`127`	`+ ble.gap_connect(`
	`128`	`+ device.addr_type,`
	`129`	`+ device.addr,`
	`130`	`+ scan_duration_ms,`
	`131`	`+ min_conn_interval_us,`
	`132`	`+ max_conn_interval_us,`
	`133`	`+ )`
`126`	`134`
`127`	`135`	`# Wait for the connected IRQ.`
`128`	`136`	`await connection._event.wait()`

`‎micropython/bluetooth/aioble/aioble/device.py‎`

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,14 +132,26 @@ def __str__(self):`
`132`	`132`	`def addr_hex(self):`
`133`	`133`	`return binascii.hexlify(self.addr, ":").decode()`
`134`	`134`
`135`		`- async def connect(self, timeout_ms=10000):`
	`135`	`+ async def connect(`
	`136`	`+ self,`
	`137`	`+ timeout_ms=10000,`
	`138`	`+ scan_duration_ms=None,`
	`139`	`+ min_conn_interval_us=None,`
	`140`	`+ max_conn_interval_us=None,`
	`141`	`+ ):`
`136`	`142`	`if self._connection:`
`137`	`143`	`return self._connection`
`138`	`144`
`139`	`145`	`# Forward to implementation in central.py.`
`140`	`146`	`from .central import _connect`
`141`	`147`
`142`		`- await _connect(DeviceConnection(self), timeout_ms)`
	`148`	`+ await _connect(`
	`149`	`+ DeviceConnection(self),`
	`150`	`+ timeout_ms,`
	`151`	`+ scan_duration_ms,`
	`152`	`+ min_conn_interval_us,`
	`153`	`+ max_conn_interval_us,`
	`154`	`+ )`
`143`	`155`
`144`	`156`	`# Start the device task that will clean up after disconnection.`
`145`	`157`	`self._connection._run_task()`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit cb68ebb

File tree

2 files changed

2 files changed

`‎micropython/bluetooth/aioble/aioble/central.py‎`

`‎micropython/bluetooth/aioble/aioble/device.py‎`

0 commit comments