pstruebi/bumble_fork
1
0
Fork 0
forked from auracaster/bumble_mirror
Code Pull Requests Activity

rebase

Browse Source
This commit is contained in:
Gilles Boccon-Gibod
2023-11-22 15:32:37 -08:00
parent 268f6b0d51
commit 3dc2e4036c
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/pair.py
View File

@@ -28,16 +28,12 @@ from bumble.pairing import OobData, PairingDelegate, PairingConfig
from bumble.smp import OobContext, OobLegacyContext from bumble.smp import OobContext, OobLegacyContext
from bumble.smp import error_name as smp_error_name from bumble.smp import error_name as smp_error_name
from bumble.keys import JsonKeyStore from bumble.keys import JsonKeyStore
<<<<<<< HEAD
from bumble.core import ( from bumble.core import (
AdvertisingData, AdvertisingData,
ProtocolError, ProtocolError,
BT_LE_TRANSPORT, BT_LE_TRANSPORT,
BT_BR_EDR_TRANSPORT, BT_BR_EDR_TRANSPORT,
) )
=======
from bumble.core import ProtocolError, BT_LE_TRANSPORT, BT_BR_EDR_TRANSPORT
>>>>>>> e3de14f (first implementation (+1 squashed commit))
from bumble.gatt import ( from bumble.gatt import (
GATT_DEVICE_NAME_CHARACTERISTIC, GATT_DEVICE_NAME_CHARACTERISTIC,
GATT_GENERIC_ACCESS_SERVICE, GATT_GENERIC_ACCESS_SERVICE,
@@ -398,14 +394,9 @@ async def pair(
print(color(f'=== Connecting to {address_or_name}...', 'green')) print(color(f'=== Connecting to {address_or_name}...', 'green'))
connection = await device.connect( connection = await device.connect(
address_or_name, address_or_name,
<<<<<<< HEAD
transport=BT_LE_TRANSPORT if mode == 'le' else BT_BR_EDR_TRANSPORT, transport=BT_LE_TRANSPORT if mode == 'le' else BT_BR_EDR_TRANSPORT,
) )
pairing_failure = False pairing_failure = False
=======
transport=(BT_LE_TRANSPORT if mode == 'le' else BT_BR_EDR_TRANSPORT),
)
>>>>>>> e3de14f (first implementation (+1 squashed commit))
if not request: if not request:
try: try: