diff --git a/controller/Makefile b/controller/Makefile deleted file mode 100644 index 2ffd7dd..0000000 --- a/controller/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -install : - pip install -r requirements.txt - cp controller.py /bin/lc; mkdir -p ~/.config/lc; cp cava.conf ~/.config/lc/cava.conf; sudo chmod 666 ~/.config/lc/cava.conf - diff --git a/controller/controller.py b/controller/controller.py index 4ebeab4..af84e15 100755 --- a/controller/controller.py +++ b/controller/controller.py @@ -10,7 +10,6 @@ import pickle import re import webview - async def scan_for_pi() -> dict(): ip = socket.gethostbyname(socket.gethostname()) baseIP = '.'.join(ip.split(".")[:3]) @@ -82,7 +81,8 @@ def set_pixels(color): # @click.option("-v", help="Set HEX Color as base visualizer color: -v ffffff") def main(arg): if arg == (): - proc = subprocess.Popen(["streamlit", "run", "streamlit.py", "--server.headless", "True"], stdout=subprocess.PIPE) + path = os.path.expanduser("~/.config/lc/gui.py") + proc = subprocess.Popen(["python", "-m", "streamlit", "run", path, "--server.headless", "True"], stdout=subprocess.PIPE) for line in proc.stdout: if line == b' You can now view your Streamlit app in your browser.\n': break diff --git a/controller/streamlit.py b/controller/gui.py similarity index 100% rename from controller/streamlit.py rename to controller/gui.py diff --git a/controller/install.sh b/controller/install.sh new file mode 100755 index 0000000..9dbc9ba --- /dev/null +++ b/controller/install.sh @@ -0,0 +1,5 @@ +sudo cp controller.py /bin/lc +mkdir -p ~/.config/lc +cp cava.conf ~/.config/lc/cava.conf +sudo chmod 666 ~/.config/lc/cava.conf +cp gui.py ~/.config/lc/gui.py diff --git a/controller/requirements.txt b/controller/requirements.txt new file mode 100644 index 0000000..0284c04 --- /dev/null +++ b/controller/requirements.txt @@ -0,0 +1,3 @@ +click==8.1.3 +pywebview==3.7.2 +streamlit==1.17.0 diff --git a/readme.md b/readme.md index 8ad028a..39ed660 100644 --- a/readme.md +++ b/readme.md @@ -3,5 +3,12 @@ ``` git clone https://git.timssfo.com/lucca/led_control cd led_control/controller -sudo make install +pip install -r requirements.txt +bash install.sh ``` + +# Usage + +`lc` for opening the gui +`lc search` searching in local network +`lc set 101010` for setting a fix color