diff --git a/nut/Usb.py b/nut/Usb.py index 4479544e3..9aad1458e 100644 --- a/nut/Usb.py +++ b/nut/Usb.py @@ -169,17 +169,32 @@ def poll_commands(in_ep, out_ep): else: Print.error('failed to read!') +def getDevice(): + while True: + devs = usb.core.find(idVendor=0x16C0, idProduct=0x27E2, find_all=True) + + if devs is not None: + for dev in devs: + return dev + + devs = usb.core.find(idVendor=0x057E, idProduct=0x3000, find_all=True) + + if devs is not None: + for dev in devs: + return dev + + + + + time.sleep(1) + def daemon(): global status while True: try: status = 'disconnected' - while True: - dev = usb.core.find(idVendor=0x057E, idProduct=0x3000) - - if dev != None: - break - time.sleep(1) + + dev = getDevice() Print.info('USB Connected') status = 'connected' diff --git a/server.py b/server.py index b1f219f2b..81957673f 100644 --- a/server.py +++ b/server.py @@ -144,7 +144,7 @@ def __init__(self): super().__init__() self.setWindowIcon(QIcon('public_html/images/logo.jpg')) screen = QDesktopWidget().screenGeometry() - self.title = 'NUT USB / Web Server v2.5' + self.title = 'NUT USB / Web Server v2.6' self.left = screen.width() / 4 self.top = screen.height() / 4 self.width = screen.width() / 2