diff --git a/.gitmodules b/.gitmodules index 401a9a86b..aea5c2c0d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "3rdparty/energenie-connect0r"] path = 3rdparty/energenie-connect0r url = https://github.com/perryflynn/energenie-connect0r.git -[submodule "3rdparty/4relay-rpi"] - path = 3rdparty/4relay-rpi - url = https://github.com/SequentMicrosystems/4relay-rpi [submodule "3rdparty/chirp-rpi"] path = 3rdparty/chirp-rpi url = https://github.com/ageir/chirp-rpi.git diff --git a/3rdparty/4relay-rpi b/3rdparty/4relay-rpi deleted file mode 160000 index 09a44bfbd..000000000 --- a/3rdparty/4relay-rpi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 09a44bfbde18791750534ba204e1dfc7506a7eb2 diff --git a/hardware/relay/8relay-stack_relay.py b/hardware/relay/8relay-stack_relay.py index cb6908afd..eb86ee474 100644 --- a/hardware/relay/8relay-stack_relay.py +++ b/hardware/relay/8relay-stack_relay.py @@ -4,14 +4,10 @@ from pathlib import Path # https://github.com/SequentMicrosystems/relay8-rpi -# https://github.com/SequentMicrosystems/8relay-rpi -# https://github.com/SequentMicrosystems/4relind-rpi -# https://github.com/SequentMicrosystems/8relind-rpi import sys -# For the old version (V1). New version (V3) will be installed as package +# For the old version (V1). Newer versions will be installed as package sys.path.insert(0, str((Path(__file__).parent / Path("../../3rdparty/relay8-rpi/python")).resolve())) -sys.path.insert(0, str((Path(__file__).parent / Path("../../3rdparty/4relay-rpi/python/4relay")).resolve())) from relay8 import set as relay8SetV1 from relay8 import get as relay8GetV1 diff --git a/requirements.txt b/requirements.txt index 6f5a5af41..e25ec1e52 100644 --- a/requirements.txt +++ b/requirements.txt @@ -56,6 +56,7 @@ bme680==1.1.1 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 # Webcam packages Pillow==9.5.0