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

common gpio path variable

Browse Source
This commit is contained in:
Devaev Maxim 2020-09-14 01:34:15 +03:00
parent 91eb257f3d
commit ee10435b81
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -89,6 +89,7 @@ run: testenv $(TESTENV_GPIO)
--volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps:ro \ --volume `pwd`/contrib/keymaps:/usr/share/kvmd/keymaps:ro \
--device $(TESTENV_VIDEO):$(TESTENV_VIDEO) \ --device $(TESTENV_VIDEO):$(TESTENV_VIDEO) \
--device $(TESTENV_GPIO):$(TESTENV_GPIO) \ --device $(TESTENV_GPIO):$(TESTENV_GPIO) \
--env KVMD_GPIO_DEVICE_PATH=$(TESTENV_GPIO) \
$(if $(TESTENV_RELAY),--device $(TESTENV_RELAY):$(TESTENV_RELAY),) \ $(if $(TESTENV_RELAY),--device $(TESTENV_RELAY):$(TESTENV_RELAY),) \
--publish 8080:80/tcp \ --publish 8080:80/tcp \
-it $(TESTENV_IMAGE) /bin/bash -c " \ -it $(TESTENV_IMAGE) /bin/bash -c " \

7
kvmd/aiogp.py
View File

@ -20,6 +20,7 @@
# ========================================================================== # # ========================================================================== #
import os
import asyncio import asyncio
import threading import threading
@ -31,6 +32,12 @@ import gpiod
from . import aiotools from . import aiotools
# =====
# XXX: Do not use this variable for any purpose other than testing.
# It can be removed at any time.
DEVICE_PATH = os.getenv("KVMD_GPIO_DEVICE_PATH", "/dev/gpiochip0")
# ===== # =====
async def pulse(line: gpiod.Line, delay: float, final: float) -> None: async def pulse(line: gpiod.Line, delay: float, final: float) -> None:
try: try:

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

@ -73,7 +73,7 @@ class Plugin(BaseAtx): # pylint: disable=too-many-instance-attributes
self.__reset_switch_line: Optional[gpiod.Line] = None self.__reset_switch_line: Optional[gpiod.Line] = None
self.__reader = aiogp.AioPinsReader( self.__reader = aiogp.AioPinsReader(
path="/dev/gpiochip0", path=aiogp.DEVICE_PATH,
consumer="kvmd/atx-gpio/leds", consumer="kvmd/atx-gpio/leds",
pins={ pins={
power_led_pin: power_led_inverted, power_led_pin: power_led_inverted,
@ -101,7 +101,7 @@ class Plugin(BaseAtx): # pylint: disable=too-many-instance-attributes
assert self.__power_switch_line is None assert self.__power_switch_line is None
assert self.__reset_switch_line is None assert self.__reset_switch_line is None
self.__chip = gpiod.Chip("/dev/gpiochip0") self.__chip = gpiod.Chip(aiogp.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_val=0) self.__power_switch_line.request("kvmd/atx-gpio/power_switch", gpiod.LINE_REQ_DIR_OUT, default_val=0)

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

@ -170,7 +170,7 @@ class _Gpio:
if self.__reset_pin >= 0: if self.__reset_pin >= 0:
assert self.__chip is None assert self.__chip is None
assert self.__reset_line is None assert self.__reset_line is None
self.__chip = gpiod.Chip("/dev/gpiochip0") self.__chip = gpiod.Chip(aiogp.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-serial/reset", gpiod.LINE_REQ_DIR_OUT, default_val=0) self.__reset_line.request("kvmd/hid-serial/reset", gpiod.LINE_REQ_DIR_OUT, default_val=0)

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

@ -174,7 +174,7 @@ class _Gpio:
assert self.__target_line is None assert self.__target_line is None
assert self.__reset_line is None assert self.__reset_line is None
self.__chip = gpiod.Chip("/dev/gpiochip0") self.__chip = gpiod.Chip(aiogp.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_val=0) self.__target_line.request("kvmd/msd-relay/target", gpiod.LINE_REQ_DIR_OUT, default_val=0)

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

@ -59,13 +59,13 @@ class Plugin(BaseUserGpioDriver):
def prepare(self) -> None: def prepare(self) -> None:
assert self.__reader is None assert self.__reader is None
self.__reader = aiogp.AioPinsReader( self.__reader = aiogp.AioPinsReader(
path="/dev/gpiochip0", path=aiogp.DEVICE_PATH,
consumer="kvmd/ugpio-gpio/inputs", consumer="kvmd/ugpio-gpio/inputs",
pins=dict.fromkeys(self.__input_pins, False), pins=dict.fromkeys(self.__input_pins, False),
notifier=self._notifier, notifier=self._notifier,
) )
self.__chip = gpiod.Chip("/dev/gpiochip0") self.__chip = gpiod.Chip(aiogp.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_val=int(initial or False)) line.request("kvmd/ugpio-gpio/outputs", gpiod.LINE_REQ_DIR_OUT, default_val=int(initial or False))