GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 00:51:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

disabled instead of empty string

Browse Source
This commit is contained in:
Maxim Devaev
2021-07-24 02:09:18 +03:00
parent 96481aa745
commit a33efcaef3
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,12 +179,12 @@ class BaseMcuHid(BaseHid, multiprocessing.Process): # pylint: disable=too-many-
if outputs1 & 0b10000000: # Dynamic
if outputs2 & 0b00000001: # USB
keyboard_outputs["available"].extend(["usb"])
mouse_outputs["available"].extend(["usb", "usb_rel"])
keyboard_outputs["available"].extend(["usb", "disabled"])
mouse_outputs["available"].extend(["usb", "usb_rel", "disabled"])
if outputs2 & 0b00000010: # PS/2
keyboard_outputs["available"].extend(["ps2"])
mouse_outputs["available"].extend(["ps2"])
keyboard_outputs["available"].extend(["ps2", "disabled"])
mouse_outputs["available"].extend(["ps2", "disabled"])
active_keyboard = get_active_keyboard(outputs1)
if active_keyboard in keyboard_outputs["available"]:

16
kvmd/plugins/hid/_mcu/proto.py
View File

@@ -38,14 +38,15 @@ class BaseEvent:
# =====
_KEYBOARD_NAMES_TO_CODES = {
"usb": 0b00000001,
"ps2": 0b00000011,
"disabled": 0b00000000,
"usb": 0b00000001,
"ps2": 0b00000011,
}
_KEYBOARD_CODES_TO_NAMES = tools.swapped_kvs(_KEYBOARD_NAMES_TO_CODES)
def get_active_keyboard(outputs: int) -> str:
return _KEYBOARD_CODES_TO_NAMES.get(outputs & 0b00000111, "")
return _KEYBOARD_CODES_TO_NAMES.get(outputs & 0b00000111, "disabled")
@dataclasses.dataclass(frozen=True)
@@ -62,15 +63,16 @@ class SetKeyboardOutputEvent(BaseEvent):
# =====
_MOUSE_NAMES_TO_CODES = {
"usb": 0b00001000,
"usb_rel": 0b00010000,
"ps2": 0b00011000,
"disabled": 0b00000000,
"usb": 0b00001000,
"usb_rel": 0b00010000,
"ps2": 0b00011000,
}
_MOUSE_CODES_TO_NAMES = tools.swapped_kvs(_MOUSE_NAMES_TO_CODES)
def get_active_mouse(outputs: int) -> str:
return _MOUSE_CODES_TO_NAMES.get(outputs & 0b00111000, "")
return _MOUSE_CODES_TO_NAMES.get(outputs & 0b00111000, "disabled")
@dataclasses.dataclass(frozen=True)