GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 17:20:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

reset mcu hid before the loop

Browse Source
This commit is contained in:
Devaev Maxim 2021-02-05 18:57:17 +03:00
parent 1a3fea916b
commit 707512a586
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kvmd/plugins/hid/_mcu/__init__.py
View File

@ -293,14 +293,10 @@ class BaseMcuHid(BaseHid, multiprocessing.Process): # pylint: disable=too-many-
time.sleep(1) time.sleep(1)
def __hid_loop(self) -> None: def __hid_loop(self) -> None:
logger = get_logger(0)
while not self.__stop_event.is_set(): while not self.__stop_event.is_set():
try: try:
if not self.__phy.has_device(): if not self.__hid_loop_wait_device():
logger.error("Missing HID device")
time.sleep(1)
continue continue
with self.__phy.connected() as conn: with self.__phy.connected() as conn:
while not (self.__stop_event.is_set() and self.__events_queue.qsize() == 0): while not (self.__stop_event.is_set() and self.__events_queue.qsize() == 0):
if self.__reset_required_event.is_set(): if self.__reset_required_event.is_set():
@ -320,9 +316,25 @@ class BaseMcuHid(BaseHid, multiprocessing.Process): # pylint: disable=too-many-
self.clear_events() self.clear_events()
except Exception: except Exception:
self.clear_events() self.clear_events()
logger.exception("Unexpected error in the HID loop") get_logger(0).exception("Unexpected error in the HID loop")
time.sleep(1) time.sleep(1)
def __hid_loop_wait_device(self) -> bool:
logger = get_logger(0)
logger.info("Initial HID reset and wait ...")
self.__gpio.reset()
# На самом деле SPI и Serial-девайсы не пропадают, просто резет и ожидание
# логичнее всего делать именно здесь. Ну и на будущее, да
for _ in range(10):
if self.__phy.has_device():
logger.info("HID found")
return True
if self.__stop_event.is_set():
break
time.sleep(1)
logger.error("Missing HID")
return False
def __process_request(self, conn: BasePhyConnection, request: bytes) -> bool: # pylint: disable=too-many-branches def __process_request(self, conn: BasePhyConnection, request: bytes) -> bool: # pylint: disable=too-many-branches
logger = get_logger() logger = get_logger()
error_messages: List[str] = [] error_messages: List[str] = []