Merge pull request #481 from AndreWohnsland/dev

Fix gpio issues on the new raspberry pi5 kernel

Author: AndreWohnsland

docs/troubleshooting.md

@@ -132,12 +132,12 @@ A better way would be to add the user to the gpio/other needed groups, so you ca
 # for v1: change this line
 # uv run --extra v1 --extra nfc runme.py
 # into:
-uv sync --extra v1 --extra nfc
+uv sync --inexact --extra v1 --extra nfc
 sudo -E .venv/bin/python runme.py
 # for v2: change this line
 # uv run --extra nfc api.py
 # into:
-uv sync --extra nfc
+uv sync --inexact --extra nfc
 sudo -E .venv/bin/python api.py
 ```
 
@@ -384,3 +384,17 @@ I've noticed when running as root (sudo python) and running as the pi user (pyth
 Using the pi user will result in the shown interfaces at CocktailBerry (and the program should work without root privilege).
 Setting the XDG_RUNTIME_DIR to use the qt5ct plugin may also work but is untested.
 Using the users environment with `sudo -E python runme.py` should also do the trick.
+
+### Raspberry Pi 5 GPIO Issues
+
+If you are using a Raspberry Pi 5, you may run into issues with the lgpio library for GPIO access.
+The latest installer should already address this issue.
+But if you are running an old installation and did a kernel update, some things might have changed.
+To fix possible issues with lgpio on the Raspberry Pi 5, please run the following commands:
+
+```bash
+cd "$HOME/CocktailBerry/"
+sudo apt install liblgpio-dev
+uv pip install lgpio
+uv run --extra v1 --extra nfc runme.py
+```

scripts/all_in_one.sh

@@ -37,7 +37,7 @@ export DEBIAN_FRONTEND=noninteractive
 export NEEDRESTART_MODE=a
 
 echo "~~ Disabling needrestart kernel hints ~~"
-sed -i "s/#\$nrconf{kernelhints} = -1;/\$nrconf{kernelhints} = -1;/g" /etc/needrestart/needrestart.conf || echo "> Could not disable needrestart kernel hints, but continuing ..."
+sudo sed -i "s/#\$nrconf{kernelhints} = -1;/\$nrconf{kernelhints} = -1;/g" /etc/needrestart/needrestart.conf || echo "> Could not disable needrestart kernel hints, but continuing ..."
 
 echo "~~ Updating system to latest version, depending on your system age, this may take some time ... ~~"
 sudo apt-get update && sudo apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade
@@ -57,22 +57,6 @@ fi
 echo "~~ linking python to python3 if not already done ~~"
 sudo apt install python-is-python3
 
-# steps for python >= 3.11
-echo "~~ Check that Python version is at least 3.11 ~~"
-version=$(python -V 2>&1 | grep -Po '(?<=Python )(.+)')
-parsedVersion="${version//./}"
-echo "> Detected version: $version"
-if [[ "$parsedVersion" -lt "3110" ]]; then
-  echo "> Python must be at least 3.11. Please upgrade your Python or the system to use CocktailBerry."
-  echo "> You can check your local Python version with 'python -V'"
-  echo "> If you have an older system, python3 -V may use the python 3, you should set up python that the python command uses python 3"
-  echo "> For a tutorial, you can look at https://alluaravind1313.medium.com/make-python3-as-default-in-ubuntu-machine-572431b69094"
-  echo "> 'apt install python-is-python3' may also fix this, but should already be installed previous this step"
-  exit 1
-else
-  echo "> You got a valid Python version."
-fi
-
 # might also need to install python-venv
 echo "~~ Check if python3-venv and ensurepip are available ~~"
 python3 -m venv --help >/dev/null 2>&1

scripts/setup.sh

@@ -46,7 +46,7 @@ else
 fi
 
 echo "> Installing nmcli, this is needed for wifi setup"
-sudo apt install network-manager
+sudo apt install network-manager liblgpio-dev
 
 # using desktop file for autostart
 echo "> Copying desktop file to: /etc/xdg/autostart/cocktail.desktop"
@@ -101,15 +101,16 @@ else
   echo "> Installing needed Python libraries, this may take a while depending on your OS (especially in v1), so it is time for a coffee break :)"
   # v1 needs to sync with system python (for pyqt)
   if [[ "$V2_FLAG" = true ]]; then
-    uv sync --extra nfc || echo "ERROR: Could not install Python libraries with uv" >&2
+    uv sync --inexact --extra nfc || echo "ERROR: Could not install Python libraries with uv" >&2
   else
     echo "> Installing PyQt"
     sudo apt-get -y install python3-pyqt6 || echo "ERROR: Could not install PyQt6" >&2
-    uv sync --extra v1 --extra nfc || echo "ERROR: Could not install Python libraries with uv" >&2
+    uv sync --inexact --extra v1 --extra nfc || echo "ERROR: Could not install Python libraries with uv" >&2
   fi
   if is_raspberry_pi5; then
     sudo usermod -aG gpio "$(whoami)"
     newgrp gpio
+    uv pip install lgpio
   fi
   # on none RPi devices, we need to set control to the GPIOs, and set user to sudoers
   if ! is_raspberry_pi; then

scripts/v1-launcher.sh

@@ -113,7 +113,7 @@ def restart_v1() -> None:
     if "SUDO_USER" in os.environ:
         cmd = ["sudo", "-E", python]
         if uv_executable:
-            subprocess.run([uv_executable, "sync", *uv_args], check=True)
+            subprocess.run([uv_executable, "sync", "--inexact", *uv_args], check=True)
     os.execvp(cmd[0], [*cmd, str(EXECUTABLE_V1), *arguments])
 
 
@@ -134,7 +134,7 @@ def restart_v2() -> None:
     if "SUDO_USER" in os.environ:
         cmd = ["sudo", "-E", python]
         if uv_executable:
-            subprocess.run([uv_executable, "sync"], check=True)
+            subprocess.run([uv_executable, "sync", "--inexact"], check=True)
     os.execvp(cmd[0], [*cmd, str(EXECUTABLE_V2), *arguments])