diff options
Diffstat (limited to 'kvmd/apps')
| -rw-r--r-- | kvmd/apps/kvmd/__init__.py | 2 | ||||
| -rw-r--r-- | kvmd/apps/kvmd/ugpio.py | 4 | ||||
| -rw-r--r-- | kvmd/apps/otg/__init__.py | 3 | ||||
| -rw-r--r-- | kvmd/apps/otgconf/__init__.py | 60 |
4 files changed, 54 insertions, 15 deletions
diff --git a/kvmd/apps/kvmd/__init__.py b/kvmd/apps/kvmd/__init__.py index 633e3346..3de764fd 100644 --- a/kvmd/apps/kvmd/__init__.py +++ b/kvmd/apps/kvmd/__init__.py @@ -86,7 +86,7 @@ def main(argv: Optional[List[str]]=None) -> None: ), info_manager=InfoManager(global_config), log_reader=LogReader(), - user_gpio=UserGpio(config.gpio, global_config.otg.udc, global_config.otg.gadget), + user_gpio=UserGpio(config.gpio, global_config.otg), ocr=TesseractOcr(**config.ocr._unpack()), hid=hid, diff --git a/kvmd/apps/kvmd/ugpio.py b/kvmd/apps/kvmd/ugpio.py index 04d72e28..458710dc 100644 --- a/kvmd/apps/kvmd/ugpio.py +++ b/kvmd/apps/kvmd/ugpio.py @@ -231,7 +231,7 @@ class _GpioOutput: # pylint: disable=too-many-instance-attributes # ===== class UserGpio: - def __init__(self, config: Section, udc: str, gadget: str) -> None: + def __init__(self, config: Section, otg_config: Section) -> None: self.__view = config.view self.__notifier = aiotools.AioNotifier() @@ -241,7 +241,7 @@ class UserGpio: instance_name=driver, notifier=self.__notifier, **drv_config._unpack(ignore=["instance_name", "notifier", "type"]), - **({"udc": udc, "gadget": gadget} if drv_config.type == "otgbind" else {}), # Hack + **({"otg_config": otg_config} if drv_config.type == "otgconf" else {}), # Hack ) for (driver, drv_config) in tools.sorted_kvs(config.drivers) } diff --git a/kvmd/apps/otg/__init__.py b/kvmd/apps/otg/__init__.py index c073ed91..1d33b98e 100644 --- a/kvmd/apps/otg/__init__.py +++ b/kvmd/apps/otg/__init__.py @@ -270,8 +270,9 @@ def _cmd_start(config: Section) -> None: # pylint: disable=too-many-statements _write(join(gadget_path, "UDC"), udc) time.sleep(config.otg.init_delay) - logger.info("Setting UDC permissions ...") + logger.info("Setting up permissions ...") _chown(join(gadget_path, "UDC"), config.otg.user) + _chown(profile_path, config.otg.user) logger.info("Ready to work") diff --git a/kvmd/apps/otgconf/__init__.py b/kvmd/apps/otgconf/__init__.py index 2ea40fca..61701ccf 100644 --- a/kvmd/apps/otgconf/__init__.py +++ b/kvmd/apps/otgconf/__init__.py @@ -27,9 +27,12 @@ import argparse import time from typing import List +from typing import Dict from typing import Generator from typing import Optional +import yaml + from ...validators.basic import valid_stripped_string_not_empty from ... import usb @@ -57,10 +60,14 @@ class _GadgetControl: try: yield finally: - if enabled: - time.sleep(self.__init_delay) - with open(udc_path, "w") as udc_file: - udc_file.write(udc) + time.sleep(self.__init_delay) + with open(udc_path, "w") as udc_file: + udc_file.write(udc) + + def __read_metas(self) -> Generator[Dict, None, None]: + for meta_name in sorted(os.listdir(self.__meta_path)): + with open(os.path.join(self.__meta_path, meta_name)) as meta_file: + yield json.loads(meta_file.read()) def enable_function(self, func: str) -> None: with self.__udc_stopped(): @@ -74,12 +81,30 @@ class _GadgetControl: os.unlink(usb.get_gadget_path(self.__gadget, usb.G_PROFILE, func)) def list_functions(self) -> None: - for meta_name in sorted(os.listdir(self.__meta_path)): - with open(os.path.join(self.__meta_path, meta_name)) as meta_file: - meta = json.loads(meta_file.read()) + for meta in self.__read_metas(): enabled = os.path.exists(usb.get_gadget_path(self.__gadget, usb.G_PROFILE, meta["func"])) print(f"{'+' if enabled else '-'} {meta['func']} # {meta['name']}") + def make_gpio_config(self) -> None: + config = { + "drivers": {"otgconf": {"type": "otgconf"}}, + "scheme": {}, + "view": {"table": []}, + } + for meta in self.__read_metas(): + config["scheme"][meta["func"]] = { # type: ignore + "driver": "otgconf", + "pin": meta["func"], + "mode": "output", + "pulse": {"delay": 0}, + } + config["view"]["table"].append([ # type: ignore + "#" + meta["name"], + "#" + meta["func"], + meta["func"], + ]) + print(yaml.dump({"kvmd": {"gpio": config}}, indent=4)) + def reset(self) -> None: with self.__udc_stopped(): pass @@ -102,14 +127,27 @@ def main(argv: Optional[List[str]]=None) -> None: parser.add_argument("-d", "--disable-function", type=valid_stripped_string_not_empty, metavar="<name>", help="Disable function") parser.add_argument("-r", "--reset-gadget", action="store_true", help="Reset gadget") + parser.add_argument("--make-gpio-config", action="store_true") options = parser.parse_args(argv[1:]) gc = _GadgetControl(config.otg.meta, config.otg.gadget, config.otg.udc, config.otg.init_delay) - if options.reset_gadget: - gc.reset() - return + + if options.list_functions: + gc.list_functions() + elif options.enable_function: gc.enable_function(options.enable_function) + gc.list_functions() + elif options.disable_function: gc.disable_function(options.disable_function) - gc.list_functions() + gc.list_functions() + + elif options.reset_gadget: + gc.reset() + + elif options.make_gpio_config: + gc.make_gpio_config() + + else: + gc.list_functions() |