From ca27c2cf100c47fcbc52d60aa6d61121775a2d9d Mon Sep 17 00:00:00 2001
From: Eric Callahan <arksine.code@gmail.com>
Date: Fri, 12 Nov 2021 06:38:10 -0500
Subject: [PATCH] power: change gpiod line request based on version

For gpiod versions 1.3 or greater use the "default_val" keyword argument to set the default, otherwise use
"default_vals".

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
---
 moonraker/components/power.py | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/moonraker/components/power.py b/moonraker/components/power.py
index bcbd454..9fe3d10 100644
--- a/moonraker/components/power.py
+++ b/moonraker/components/power.py
@@ -462,6 +462,8 @@ class HTTPDevice(PowerDevice):
 class GpioChipFactory:
     def __init__(self) -> None:
         self.chips: Dict[str, gpiod.Chip] = {}
+        version: str = gpiod.version_string()
+        self.gpiod_version = tuple(int(v) for v in version.split('.'))
 
     def get_gpio_chip(self, chip_name) -> gpiod.Chip:
         if chip_name in self.chips:
@@ -470,6 +472,9 @@ class GpioChipFactory:
         self.chips[chip_name] = chip
         return chip
 
+    def get_gpiod_version(self):
+        return self.gpiod_version
+
     def close(self) -> None:
         for chip in self.chips.values():
             chip.close()
@@ -493,15 +498,17 @@ class GpioDevice(PowerDevice):
         try:
             chip = chip_factory.get_gpio_chip(chip_id)
             self.line = chip.get_line(pin)
+            args: Dict[str, Any] = {
+                'consumer': "moonraker",
+                'type': gpiod.LINE_REQ_DIR_OUT
+            }
             if invert:
-                self.line.request(
-                    consumer="moonraker", type=gpiod.LINE_REQ_DIR_OUT,
-                    flags=gpiod.LINE_REQ_FLAG_ACTIVE_LOW,
-                    default_vals=[int(self.initial_state)])
+                args['flags'] = gpiod.LINE_REQ_FLAG_ACTIVE_LOW
+            if chip_factory.get_gpiod_version() < (1, 3):
+                args['default_vals'] = [int(self.initial_state)]
             else:
-                self.line.request(
-                    consumer="moonraker", type=gpiod.LINE_REQ_DIR_OUT,
-                    default_vals=[int(self.initial_state)])
+                args['default_val'] = int(self.initial_state)
+            self.line.request(**args)
         except Exception:
             self.state = "error"
             logging.exception(
@@ -509,7 +516,6 @@ class GpioDevice(PowerDevice):
                 "use by another program or exported by sysfs.")
             raise config.error("Power GPIO Config Error")
 
-
     def _parse_pin(self, config: ConfigHelper) -> Tuple[int, str, bool]:
         pin = cfg_pin = config.get("pin")
         invert = False
@@ -578,10 +584,6 @@ class RFDevice(GpioDevice):
         self.on = config.get("on_code").zfill(24)
         self.off = config.get("off_code").zfill(24)
 
-    def initialize(self) -> None:
-        super().initialize()
-        self.set_power("on" if self.initial_state else "off")
-
     def _transmit_digit(self, waveform) -> None:
         self.line.set_value(1)
         time.sleep(waveform[0]*RFDevice.PULSE_LEN)