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

refactoring

Browse Source
This commit is contained in:
Devaev Maxim
2020-11-12 22:36:22 +03:00
parent 87cc8cf7b0
commit 180251ec59
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kvmd/plugins/atx/gpio.py
View File

@@ -78,7 +78,7 @@ class Plugin(BaseAtx): # pylint: disable=too-many-instance-attributes
self.__reader = aiogp.AioReader( self.__reader = aiogp.AioReader(
path=env.GPIO_DEVICE_PATH, path=env.GPIO_DEVICE_PATH,
consumer="kvmd::atx-gpio::leds", consumer="kvmd::atx::leds",
pins={ pins={
power_led_pin: aiogp.AioReaderPinParams(power_led_inverted, power_led_debounce), power_led_pin: aiogp.AioReaderPinParams(power_led_inverted, power_led_debounce),
hdd_led_pin: aiogp.AioReaderPinParams(hdd_led_inverted, hdd_led_debounce), hdd_led_pin: aiogp.AioReaderPinParams(hdd_led_inverted, hdd_led_debounce),
@@ -111,10 +111,10 @@ class Plugin(BaseAtx): # pylint: disable=too-many-instance-attributes
self.__chip = gpiod.Chip(env.GPIO_DEVICE_PATH) self.__chip = gpiod.Chip(env.GPIO_DEVICE_PATH)
self.__power_switch_line = self.__chip.get_line(self.__power_switch_pin) self.__power_switch_line = self.__chip.get_line(self.__power_switch_pin)
self.__power_switch_line.request("kvmd::atx-gpio::power_switch", gpiod.LINE_REQ_DIR_OUT, default_vals=[0]) self.__power_switch_line.request("kvmd::atx::power_switch", gpiod.LINE_REQ_DIR_OUT, default_vals=[0])
self.__reset_switch_line = self.__chip.get_line(self.__reset_switch_pin) self.__reset_switch_line = self.__chip.get_line(self.__reset_switch_pin)
self.__reset_switch_line.request("kvmd::atx-gpio::reset_switch", gpiod.LINE_REQ_DIR_OUT, default_vals=[0]) self.__reset_switch_line.request("kvmd::atx::reset_switch", gpiod.LINE_REQ_DIR_OUT, default_vals=[0])
async def get_state(self) -> Dict: async def get_state(self) -> Dict:
return { return {

2
kvmd/plugins/hid/_mcu/gpio.py
View File

@@ -54,7 +54,7 @@ class Gpio:
assert self.__reset_line is None assert self.__reset_line is None
self.__chip = gpiod.Chip(env.GPIO_DEVICE_PATH) self.__chip = gpiod.Chip(env.GPIO_DEVICE_PATH)
self.__reset_line = self.__chip.get_line(self.__reset_pin) self.__reset_line = self.__chip.get_line(self.__reset_pin)
self.__reset_line.request("kvmd::hid-mcu::reset", gpiod.LINE_REQ_DIR_OUT, default_vals=[int(self.__reset_inverted)]) self.__reset_line.request("kvmd::hid::reset", gpiod.LINE_REQ_DIR_OUT, default_vals=[int(self.__reset_inverted)])
def close(self) -> None: def close(self) -> None:
if self.__chip: if self.__chip:

2
kvmd/plugins/hid/spi.py
View File

@@ -147,7 +147,7 @@ class _SpiPhy(BasePhy): # pylint: disable=too-many-instance-attributes
if self.__sw_cs_pin > 0: if self.__sw_cs_pin > 0:
with contextlib.closing(gpiod.Chip(env.GPIO_DEVICE_PATH)) as chip: with contextlib.closing(gpiod.Chip(env.GPIO_DEVICE_PATH)) as chip:
line = chip.get_line(self.__sw_cs_pin) line = chip.get_line(self.__sw_cs_pin)
line.request("kvmd::hid-mcu::sw_cs", gpiod.LINE_REQ_DIR_OUT, default_vals=[1]) line.request("kvmd::hid::sw_cs", gpiod.LINE_REQ_DIR_OUT, default_vals=[1])
yield line yield line
else: else:
yield None yield None

4
kvmd/plugins/msd/relay.py
View File

@@ -176,10 +176,10 @@ class _Gpio:
self.__chip = gpiod.Chip(env.GPIO_DEVICE_PATH) self.__chip = gpiod.Chip(env.GPIO_DEVICE_PATH)
self.__target_line = self.__chip.get_line(self.__target_pin) self.__target_line = self.__chip.get_line(self.__target_pin)
self.__target_line.request("kvmd::msd-relay::target", gpiod.LINE_REQ_DIR_OUT, default_vals=[0]) self.__target_line.request("kvmd::msd::target", gpiod.LINE_REQ_DIR_OUT, default_vals=[0])
self.__reset_line = self.__chip.get_line(self.__reset_pin) self.__reset_line = self.__chip.get_line(self.__reset_pin)
self.__reset_line.request("kvmd::msd-relay::reset", gpiod.LINE_REQ_DIR_OUT, default_vals=[0]) self.__reset_line.request("kvmd::msd::reset", gpiod.LINE_REQ_DIR_OUT, default_vals=[0])
def close(self) -> None: def close(self) -> None:
if self.__chip: if self.__chip:

2
kvmd/plugins/ugpio/ezcoo.py
View File

@@ -134,7 +134,7 @@ class Plugin(BaseUserGpioDriver): # pylint: disable=too-many-instance-attribute
logger.info("Started %s pid=%d", self, os.getpid()) logger.info("Started %s pid=%d", self, os.getpid())
aioproc.ignore_sigint() aioproc.ignore_sigint()
aioproc.rename_process(f"ugpio-ezcoo-{self._instance_name}") aioproc.rename_process(f"gpio-ezcoo-{self._instance_name}")
while not self.__stop_event.is_set(): while not self.__stop_event.is_set():
try: try:

4
kvmd/plugins/ugpio/gpio.py
View File

@@ -60,7 +60,7 @@ class Plugin(BaseUserGpioDriver):
assert self.__reader is None assert self.__reader is None
self.__reader = aiogp.AioReader( self.__reader = aiogp.AioReader(
path=env.GPIO_DEVICE_PATH, path=env.GPIO_DEVICE_PATH,
consumer="kvmd::ugpio-gpio::inputs", consumer="kvmd::gpio::inputs",
pins=self.__input_pins, pins=self.__input_pins,
notifier=self._notifier, notifier=self._notifier,
) )
@@ -68,7 +68,7 @@ class Plugin(BaseUserGpioDriver):
self.__chip = gpiod.Chip(env.GPIO_DEVICE_PATH) self.__chip = gpiod.Chip(env.GPIO_DEVICE_PATH)
for (pin, initial) in self.__output_pins.items(): for (pin, initial) in self.__output_pins.items():
line = self.__chip.get_line(pin) line = self.__chip.get_line(pin)
line.request("kvmd::ugpio-gpio::outputs", gpiod.LINE_REQ_DIR_OUT, default_vals=[int(initial or False)]) line.request("kvmd::gpio::outputs", gpiod.LINE_REQ_DIR_OUT, default_vals=[int(initial or False)])
self.__output_lines[pin] = line self.__output_lines[pin] = line
async def run(self) -> None: async def run(self) -> None: