From 73281e20d9e59311f69a033550fe1baa8687ae69 Mon Sep 17 00:00:00 2001 From: TheYOSH Date: Fri, 5 Jan 2024 23:40:53 +0100 Subject: [PATCH] Move to pip package --- .gitmodules | 3 --- 3rdparty/Bright-Pi | 1 - hardware/relay/brightpi_relay.py | 10 ++-------- requirements.txt | 1 + 4 files changed, 3 insertions(+), 12 deletions(-) delete mode 160000 3rdparty/Bright-Pi diff --git a/.gitmodules b/.gitmodules index aea5c2c0d..4500a3679 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "3rdparty/Bright-Pi"] - path = 3rdparty/Bright-Pi - url = https://github.com/PiSupply/Bright-Pi [submodule "3rdparty/relay8-rpi"] path = 3rdparty/relay8-rpi url = https://github.com/SequentMicrosystems/relay8-rpi diff --git a/3rdparty/Bright-Pi b/3rdparty/Bright-Pi deleted file mode 160000 index eccfbbb12..000000000 --- a/3rdparty/Bright-Pi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eccfbbb1221c4966cd337126bedcbb8bb03c3c71 diff --git a/hardware/relay/brightpi_relay.py b/hardware/relay/brightpi_relay.py index aacd3b578..bfb98423f 100644 --- a/hardware/relay/brightpi_relay.py +++ b/hardware/relay/brightpi_relay.py @@ -1,14 +1,8 @@ from . import terrariumRelayDimmer import statistics -import sys -from pathlib import Path - -# https://github.com/PiSupply/Bright-Pi -# Dirty hack to include someone his code... to lazy to make it myself :) -# Also, do not want to compile stuff.... -sys.path.insert(0, str((Path(__file__).parent / Path("../../3rdparty/Bright-Pi/brightpi")).resolve())) -import brightpilib as brightpi + +import brightpi class terrariumRelayDimmerBrightPi(terrariumRelayDimmer): diff --git a/requirements.txt b/requirements.txt index e25ec1e52..13c8b59db 100644 --- a/requirements.txt +++ b/requirements.txt @@ -57,6 +57,7 @@ adafruit-circuitpython-sht31d==2.3.24 SM8relind==1.0.2 git+https://github.com/SequentMicrosystems/4relind-rpi.git#subdirectory=python/4relind git+https://github.com/SequentMicrosystems/4relay-rpi.git#subdirectory=python/4relay +git+https://github.com/PiSupply/Bright-Pi # Webcam packages Pillow==9.5.0