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

removed rpi.gpio

Browse Source
This commit is contained in:
Devaev Maxim 2020-09-13 21:43:52 +03:00
parent 0ad0d17528
commit 5ed0c27f1f
7 changed files with 33 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PKGBUILD
View File

@ -39,7 +39,6 @@ depends=(
python-aiohttp
python-aiofiles
python-passlib
python-raspberry-gpio
python-pyserial
python-setproctitle
python-psutil

7
kvmd/apps/kvmd/__init__.py
View File

@ -25,8 +25,6 @@ from typing import Optional
from ...logging import get_logger
from ... import gpio
from ...plugins.hid import get_hid_class
from ...plugins.atx import get_atx_class
from ...plugins.msd import get_msd_class
@ -45,6 +43,8 @@ from .server import KvmdServer
# =====
def main(argv: Optional[List[str]]=None) -> None:
# pylint: disable=protected-access
config = init(
prog="kvmd",
description="The main Pi-KVM daemon",
@ -56,9 +56,6 @@ def main(argv: Optional[List[str]]=None) -> None:
load_gpio=True,
)[2]
with gpio.bcm():
# pylint: disable=protected-access
msd_kwargs = config.kvmd.msd._unpack(ignore=["type"])
if config.kvmd.msd.type == "otg":
msd_kwargs["gadget"] = config.otg.gadget # XXX: Small crutch to pass gadget name to plugin

101
kvmd/gpio.py
View File

@ -1,101 +0,0 @@
# ========================================================================== #
# #
# KVMD - The main Pi-KVM daemon. #
# #
# Copyright (C) 2018 Maxim Devaev <mdevaev@gmail.com> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# ========================================================================== #
import asyncio
import contextlib
from typing import Tuple
from typing import Set
from typing import Generator
from typing import Optional
from RPi import GPIO
from .logging import get_logger
from . import aiotools
# =====
@contextlib.contextmanager
def bcm() -> Generator[None, None, None]:
logger = get_logger(2)
GPIO.setmode(GPIO.BCM)
logger.info("Configured GPIO mode as BCM")
try:
yield
finally:
GPIO.cleanup()
logger.info("GPIO cleaned")
def set_output(pin: int, initial: Optional[bool]) -> int:
assert pin >= 0, pin
GPIO.setup(pin, GPIO.OUT, initial=initial)
return pin
def set_input(pin: int) -> int:
assert pin >= 0, pin
GPIO.setup(pin, GPIO.IN)
return pin
def read(pin: int) -> bool:
assert pin >= 0, pin
return bool(GPIO.input(pin))
def write(pin: int, state: bool) -> None:
assert pin >= 0, pin
GPIO.output(pin, state)
class BatchReader:
def __init__(
self,
pins: Set[int],
interval: float,
notifier: aiotools.AioNotifier,
) -> None:
self.__pins = sorted(pins)
self.__interval = interval
self.__notifier = notifier
self.__state = {pin: read(pin) for pin in self.__pins}
self.__flags: Tuple[Optional[bool], ...] = (None,) * len(self.__pins)
def get(self, pin: int) -> bool:
return self.__state[pin]
async def poll(self) -> None:
if not self.__pins:
await aiotools.wait_infinite()
else:
while True:
flags = tuple(map(read, self.__pins))
if flags != self.__flags:
self.__flags = flags
self.__state = dict(zip(self.__pins, flags))
await self.__notifier.notify()
await asyncio.sleep(self.__interval)

2
testenv/linters/vulture-wl.py
View File

@ -20,8 +20,6 @@ IpmiServer.handle_raw_request
_AtxApiPart.switch_power
fake_rpi.RPi.GPIO
_KeyMapping.web_name
_KeyMapping.serial_code
_KeyMapping.arduino_name

2
testenv/requirements.txt
View File

@ -1,5 +1,3 @@
git+git://github.com/willbuckner/rpi-gpio-development-mock@master#egg=rpi
fake_rpi
aiohttp
aiofiles
passlib

39
testenv/tests/__init__.py
View File

@ -18,42 +18,3 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# ========================================================================== #
import sys
from typing import Dict
from typing import Optional
import fake_rpi.RPi
# =====
class _GPIO(fake_rpi.RPi._GPIO): # pylint: disable=protected-access
def __init__(self) -> None:
super().__init__()
self.__states: Dict[int, int] = {}
@fake_rpi.RPi.printf
def setup(self, channel: int, state: int, initial: int=0, pull_up_down: Optional[int]=None) -> None:
_ = state # Makes linter happy
_ = pull_up_down # Makes linter happy
self.__states[int(channel)] = int(initial)
@fake_rpi.RPi.printf
def output(self, channel: int, state: int) -> None:
self.__states[int(channel)] = int(state)
@fake_rpi.RPi.printf
def input(self, channel: int) -> int: # pylint: disable=arguments-differ
return self.__states[int(channel)]
@fake_rpi.RPi.printf
def cleanup(self, channel: Optional[int]=None) -> None: # pylint: disable=arguments-differ
_ = channel # Makes linter happy
self.__states = {}
# =====
fake_rpi.RPi.GPIO = _GPIO()
sys.modules["RPi"] = fake_rpi.RPi

58
testenv/tests/test_gpio.py
View File

@ -1,58 +0,0 @@
# ========================================================================== #
# #
# KVMD - The main Pi-KVM daemon. #
# #
# Copyright (C) 2018 Maxim Devaev <mdevaev@gmail.com> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
# #
# ========================================================================== #
import pytest
from kvmd import gpio
# =====
@pytest.mark.parametrize("pin", [0, 1, 13])
def test_ok__loopback_initial_false(pin: int) -> None:
with gpio.bcm():
assert gpio.set_output(pin, False) == pin
assert gpio.read(pin) is False
gpio.write(pin, True)
assert gpio.read(pin) is True
@pytest.mark.parametrize("pin", [0, 1, 13])
def test_ok__loopback_initial_true(pin: int) -> None:
with gpio.bcm():
assert gpio.set_output(pin, True) == pin
assert gpio.read(pin) is True
gpio.write(pin, False)
assert gpio.read(pin) is False
@pytest.mark.parametrize("pin", [0, 1, 13])
def test_ok__input(pin: int) -> None:
with gpio.bcm():
assert gpio.set_input(pin) == pin
assert gpio.read(pin) is False
def test_fail__invalid_pin() -> None:
with pytest.raises(AssertionError):
gpio.set_output(-1, False)
with pytest.raises(AssertionError):
gpio.set_input(-1)