From a8589e48abb9853b0b3ccec31fc6898f6393de3e Mon Sep 17 00:00:00 2001 From: Oleg Girko Date: Sun, 20 Sep 2020 14:53:03 +0100 Subject: [PATCH] Make kvmd compatible with libgpiod 1.2. The singular default_val argument of gpiod.Line.request() method was introduced in libgpiod 1.3. For older versions of libgpiod, defailt_vals argument with list value should be used. This argument is available in newer versions of libgpiod as well for compatibility. This change is needed for Debian / Raspbian 10 that have libgpiod 1.2. Signed-off-by: Oleg Girko --- kvmd/plugins/atx/gpio.py | 4 ++-- kvmd/plugins/hid/serial.py | 2 +- kvmd/plugins/msd/relay.py | 4 ++-- kvmd/plugins/ugpio/gpio.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kvmd/plugins/atx/gpio.py b/kvmd/plugins/atx/gpio.py index a76c5118..d26f28a7 100644 --- a/kvmd/plugins/atx/gpio.py +++ b/kvmd/plugins/atx/gpio.py @@ -111,10 +111,10 @@ def sysprep(self) -> None: self.__chip = gpiod.Chip(aiogp.DEVICE_PATH) 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_vals=[0]) 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_val=0) + self.__reset_switch_line.request("kvmd::atx-gpio::reset_switch", gpiod.LINE_REQ_DIR_OUT, default_vals=[0]) async def get_state(self) -> Dict: return { diff --git a/kvmd/plugins/hid/serial.py b/kvmd/plugins/hid/serial.py index 44ee08aa..594bf4ef 100644 --- a/kvmd/plugins/hid/serial.py +++ b/kvmd/plugins/hid/serial.py @@ -172,7 +172,7 @@ def open(self) -> None: assert self.__reset_line is None self.__chip = gpiod.Chip(aiogp.DEVICE_PATH) 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_vals=[0]) def close(self) -> None: if self.__chip: diff --git a/kvmd/plugins/msd/relay.py b/kvmd/plugins/msd/relay.py index ac09b5c9..f4ecc6ab 100644 --- a/kvmd/plugins/msd/relay.py +++ b/kvmd/plugins/msd/relay.py @@ -177,10 +177,10 @@ def open(self) -> None: self.__chip = gpiod.Chip(aiogp.DEVICE_PATH) 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_vals=[0]) self.__reset_line = self.__chip.get_line(self.__reset_pin) - self.__reset_line.request("kvmd::msd-relay::reset", gpiod.LINE_REQ_DIR_OUT, default_val=0) + self.__reset_line.request("kvmd::msd-relay::reset", gpiod.LINE_REQ_DIR_OUT, default_vals=[0]) def close(self) -> None: if self.__chip: diff --git a/kvmd/plugins/ugpio/gpio.py b/kvmd/plugins/ugpio/gpio.py index e7bcc683..7c3f317c 100644 --- a/kvmd/plugins/ugpio/gpio.py +++ b/kvmd/plugins/ugpio/gpio.py @@ -67,7 +67,7 @@ def prepare(self) -> None: self.__chip = gpiod.Chip(aiogp.DEVICE_PATH) for (pin, initial) in self.__output_pins.items(): 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_vals=[int(initial or False)]) self.__output_lines[pin] = line async def run(self) -> None: