From 625c4c2412a40676db2f4099cd5896093a274067 Mon Sep 17 00:00:00 2001 From: Alexander Wellbrock <a.wellbrock@mailbox.org> Date: Mon, 11 Jan 2021 10:37:18 +0100 Subject: [PATCH] move gpiod module config to CONFIG_SCHEMA constant --- pi_mqtt_gpio/__init__.py | 4 ---- pi_mqtt_gpio/modules/__init__.py | 3 +-- pi_mqtt_gpio/modules/gpiod.py | 8 ++++++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pi_mqtt_gpio/__init__.py b/pi_mqtt_gpio/__init__.py index c497b9c..7dd2eb1 100644 --- a/pi_mqtt_gpio/__init__.py +++ b/pi_mqtt_gpio/__init__.py @@ -127,10 +127,6 @@ gpio_modules: type: boolean required: no default: yes - chip: - type: string - required: no - default: "/dev/gpiochip0" sensor_modules: type: list diff --git a/pi_mqtt_gpio/modules/__init__.py b/pi_mqtt_gpio/modules/__init__.py index 8433a04..ed7161c 100644 --- a/pi_mqtt_gpio/modules/__init__.py +++ b/pi_mqtt_gpio/modules/__init__.py @@ -7,8 +7,7 @@ from time import sleep BASE_SCHEMA = { "name": {"required": True, "empty": False}, "module": {"required": True, "empty": False}, - "cleanup": {"required": False, "type": "boolean", "default": True}, - "chip": {"required": False, "type": "string", "default": "/dev/gpiochip0"}, + "cleanup": {"required": False, "type": "boolean", "default": True} } diff --git a/pi_mqtt_gpio/modules/gpiod.py b/pi_mqtt_gpio/modules/gpiod.py index 6a9e0c6..3c32a82 100644 --- a/pi_mqtt_gpio/modules/gpiod.py +++ b/pi_mqtt_gpio/modules/gpiod.py @@ -6,6 +6,14 @@ from threading import Thread # Requires libgpiod-devel, libgpiod REQUIREMENTS = ("gpiod",) +CONFIG_SCHEMA = { + "chip": { + "type": "string", + "required": False, + "default": "/dev/gpiochip0" + } +} + DIRECTIONS = None PULLUPS = None INTERRUPT = None -- GitLab