diff --git a/BiogasControllerAppLogo.ico b/BiogasControllerAppLogo.ico index f42f729..19c4d14 100644 Binary files a/BiogasControllerAppLogo.ico and b/BiogasControllerAppLogo.ico differ diff --git a/BiogasControllerAppLogo.png b/BiogasControllerAppLogo.png index 2bd6e93..ae97260 100644 Binary files a/BiogasControllerAppLogo.png and b/BiogasControllerAppLogo.png differ diff --git a/BiogasControllerAppLogo.xcf b/BiogasControllerAppLogo.xcf new file mode 100755 index 0000000..5d2da9c Binary files /dev/null and b/BiogasControllerAppLogo.xcf differ diff --git a/README.md b/README.md index b762525..fc1d99f 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ BiogasControllerApp has just received a major rewrite, where I focused on code-readability, documentation and stability. The documentation in the code is aimed at beginners and does contain some unnecessary extra comments -If you are here to read the code, the files you are most likely looking for can be found in the `biogascontrollerapp/lib` folder. If you want to understand and have a look at all of the application, start with the `biogascontrollerapp.py` file in the `biogascontrollerapp` folder +If you are here to read the code, the files you are most likely looking for can be found in the `lib` folder. If you want to understand and have a look at all of the application, start with the `biogascontrollerapp.py` file # Features - Read data the microcontroller in ENATECH sends @@ -67,7 +67,7 @@ Only needed if you run with python directly - kivy[base] - pyserial -To install them, run `pip install -r requirements.txt` in the `biogascontrollerapp/` directory +To install them, run `pip install -r requirements.txt` # Contributing If you wish to contribute to this project, please fork this repository, create a new branch in your fork, make your changes and open a pull request in this repo. diff --git a/install-linux.sh b/install-linux.sh index cad9991..476ede4 100755 --- a/install-linux.sh +++ b/install-linux.sh @@ -33,7 +33,7 @@ use_venv=$(echo "$use_venv" | tr '[:upper:]' '[:lower:]') echo "\n => Checking for repo..." -if [[ -f ./biogascontrollerapp/biogascontrollerapp.py ]]; then +if [[ -f ./biogascontrollerapp.py ]]; then echo "\n -> Data found, not downloading" else do_download="" @@ -63,10 +63,6 @@ else fi # We are now guaranteed to be in the base directory of the repo - -# cd into biogascontrollerapp directory -cd ./biogascontrollerapp/ - # Set up venv if selected if [[ "$use_venv" == "y" || "$use_venv" == "" ]]; then python -m venv .venv diff --git a/launch.sh b/launch.sh index 9d8d10e..6210a92 100755 --- a/launch.sh +++ b/launch.sh @@ -1,7 +1,7 @@ #!/bin/sh use_venv="y" -if [[ -f ./biogascontrollerapp/.venv/bin/activate ]]; then +if [[ -f ./.venv/bin/activate ]]; then if [[ "$SHELL" == "fish" ]]; then source ./.venv/bin/activate.fish elif [[ "$SHELL" == "csh" ]]; then @@ -15,5 +15,4 @@ if [[ -f ./biogascontrollerapp/.venv/bin/activate ]]; then fi fi -cd ./biogascontrollerapp/ python biogascontrollerapp.py