salfter/USB4VC
1
0
Fork 0
mirror of https://github.com/dekuNukem/USB4VC.git synced 2025-10-31 11:26:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

bluetooth pairing now ignores already paired devices

Browse Source
This commit is contained in:
dekunukem
2022-01-04 10:15:37 +00:00
parent 806922c637
commit dff611aad7
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
user_program/usb4vc_ui.py
View File

@@ -260,8 +260,6 @@ def scan_bt_devices(timeout_sec = 5):
if len(line_split) < 3 or line_split[2].count('-') == 5:
continue
dev_list.append((line_split[1], line_split[2]))
if len(dev_list) == 0:
return None, 'Nothing was found'
return dev_list, ''
def pair_device(mac_addr):
@@ -314,7 +312,7 @@ def get_paired_devices():
dev_set.add((line_split[1], line_split[2]))
except Exception as e:
print('get_paired_devices exception:', e)
return list(dev_set)
return dev_set
def load_config():
global configuration_dict
@@ -436,8 +434,11 @@ class usb4vc_menu(object):
self.goto_page(3)
self.display_curent_page()
return
paired_devices_set = get_paired_devices()
self.bluetooth_device_list, self.error_message = scan_bt_devices(self.bt_scan_timeout_sec)
if self.bluetooth_device_list is None:
self.bluetooth_device_list = list(set(self.bluetooth_device_list) - paired_devices_set)
if len(self.bluetooth_device_list) == 0:
self.error_message = "Nothing was found"
self.goto_page(3)
self.display_curent_page()
return
@@ -525,7 +526,7 @@ class usb4vc_menu(object):
def action(self, level, page):
if level == 0:
if page == 2:
self.paired_devices_list = get_paired_devices()
self.paired_devices_list = list(get_paired_devices())
self.page_size[4] = len(self.paired_devices_list) + 1
self.goto_level(4)
elif page == 3:

2
user_program/usb4vc_usb_scan.py
View File

@@ -595,7 +595,7 @@ def get_pboard_info():
this_msg[5] = usb4vc_shared.RPI_APP_VERSION_TUPLE[2]
pcard_spi.xfer(this_msg)
time.sleep(0.01)
time.sleep(0.1)
# send an empty message to allow response to be shifted into RPi
response = pcard_spi.xfer(list(nop_spi_msg_template))
time.sleep(0.01)