[Automated] Merged develop into target master

mainsail-crew · Jan 8, 2024 · 6659f30 · 6659f30
2 parents f7ac6aa + fcd12d3
commit 6659f30
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -90,6 +90,7 @@ See the [README.md](https://github.com/mainsail-crew/crowsnest/tree/legacy/v3) o
 #### Hint Bookworm
 
 Raspberry Pi OS images that are based on Debian 12 (codename 'bookworm') currently use a different branch of [camera-streamer](https://github.com/ayufan/camera-streamer)!
+The Raspberry Pi 5 has only [ustreamer](https://github.com/pikvm/ustreamer) support! This is due to the missing JPEG and H264 Hardware encoders.
 
 ---
 

diff --git a/bin/build.sh b/bin/build.sh
@@ -73,6 +73,30 @@ is_raspberry_pi() {
     fi
 }
 
+is_bookworm() {
+    if [[ -f /etc/os-release ]]; then
+        grep -cq "bookworm" /etc/os-release &> /dev/null && echo "1" || echo "0"
+    fi
+}
+
+is_pi5() {
+    if [[ -f /proc/device-tree/model ]] &&
+    grep -q "Raspberry Pi 5" /proc/device-tree/model; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
+
+is_ubuntu_arm() {
+    if [[ "$(is_raspberry_pi)" = "1" ]] &&
+    grep -q "ubuntu" /etc/os-release; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
+
 ### Get avail mem
 get_avail_mem() {
     grep "MemTotal" /proc/meminfo | awk '{print $2}'
@@ -108,18 +132,26 @@ clone_ustreamer() {
 clone_cstreamer() {
     ## Special handling because only supported on Raspberry Pi
     [[ -n "${CROWSNEST_UNATTENDED}" ]] || CROWSNEST_UNATTENDED="0"
-    if [[ "$(is_raspberry_pi)" = "0" ]] && [[ "${CROWSNEST_UNATTENDED}" = "0" ]]; then
+    if { [[ "$(is_raspberry_pi)" = "0" ]] ||
+    [[ "$(is_pi5)" = "1" ]] ||
+    [[ "$(is_ubuntu_arm)" = "1" ]]; } &&
+    [[ "${CROWSNEST_UNATTENDED}" = "0" ]]; then
         printf "WARN: Cloning camera-streamer skipped! Device is not supported!"
         return
     fi
     if [[ -d "${BASE_CN_BIN_PATH}"/"${CSTREAMER_PATH}" ]]; then
         printf "%s already exist ... [SKIPPED]\n" "${CSTREAMER_PATH}"
         return
     fi
+    if [[ "$(is_bookworm)" = "1" ]]; then
+        printf "\nBookworm detected!\n"
+        printf "Using main branch of camera-streamer for Bookworm ...\n\n"
+        CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="main"
+    fi
     git clone "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" \
         -b "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" \
         "${BASE_CN_BIN_PATH}"/"${CSTREAMER_PATH}" \
-        "${CLONE_FLAGS[@]}" --recursive
+        "${CLONE_FLAGS[@]}" --recurse-submodules --shallow-submodules
 }
 
 ### Clone Apps

diff --git a/libs/core.sh b/libs/core.sh
@@ -93,7 +93,9 @@ function check_apps {
     fi
 
     ## Avoid dependency check if non rpi sbc
-    if [[ "$(is_raspberry_pi)" = "1" ]] && [[ "$(is_ubuntu_arm)" = "0" ]]; then
+    if [[ "$(is_raspberry_pi)" = "1" ]] &&
+    [[ "$(is_ubuntu_arm)" = "0" ]] &&
+    [[ "$(is_pi5)" = "0" ]]; then
         if [[ -x "${BASE_CN_PATH}/${cstreamer}" ]]; then
             log_msg "Dependency: '${cstreamer##*/}' found in ${cstreamer}."
         else

diff --git a/libs/hwhandler.sh b/libs/hwhandler.sh
@@ -86,13 +86,16 @@ get_libcamera_path() {
 # Determine connected "legacy" device
 function detect_legacy {
     local avail
-    if [[ -f /proc/device-tree/model ]] &&
-    grep -q "Raspberry" /proc/device-tree/model; then
-        avail="$(vcgencmd get_camera | awk -F '=' '{ print $3 }' | cut -d',' -f1)"
-    else
-        avail="0"
+    if [[ "$(is_raspberry_pi)" = "1" ]] &&
+    command -v vcgencmd &> /dev/null; then
+        if vcgencmd get_camera &> /dev/null ; then
+            avail="$(vcgencmd get_camera \
+                    | awk -F '=' '{ print $3 }' \
+                    | cut -d',' -f1 \
+                    )"
+        fi
     fi
-    echo "${avail}"
+    echo "${avail:-0}"
 }
 
 function dev_is_legacy {
@@ -128,6 +131,15 @@ is_raspberry_pi() {
     fi
 }
 
+is_pi5() {
+    if [[ -f /proc/device-tree/model ]] &&
+    grep -q "Raspberry Pi 5" /proc/device-tree/model; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
+
 is_ubuntu_arm() {
     if [[ "$(is_raspberry_pi)" = "1" ]] &&
     grep -q "ubuntu" /etc/os-release; then

diff --git a/libs/init_stream.sh b/libs/init_stream.sh
@@ -27,7 +27,9 @@ function construct_streamer {
         check_section "${cams}"
         case ${mode} in
             [mM]ulti | camera-streamer)
-                if [[ "$(is_raspberry_pi)" = "1" ]] && [[ "$(is_ubuntu_arm)" = "0" ]]; then
+                if [[ "$(is_raspberry_pi)" = "1" ]] &&
+                [[ "$(is_ubuntu_arm)" = "0" ]] &&
+                [[ "$(is_pi5)" = "0" ]]; then
                     MULTI_INSTANCES+=( "${cams}" )
                 else
                     log_msg "WARN: Mode 'camera-streamer' is not supported on your device!"

diff --git a/libs/ustreamer.sh b/libs/ustreamer.sh
@@ -24,7 +24,7 @@ run_mjpg() {
         run_ustreamer "${instance}" &
     done
     blockyfix
-    brokenfocus
+    brokenfocus "${cams}"
     return
 }
 

diff --git a/libs/v4l2_control.sh b/libs/v4l2_control.sh
@@ -116,7 +116,7 @@ function brokenfocus {
 
     function main {
         local cur_val conf_val device
-        for cam in $(configured_cams); do
+        for cam in ${1}; do
             device="$(get_param "cam ${cam}" device)"
             cur_val="$(get_current_value "${device}")"
             conf_val="$(get_conf_value "${cam}")"
@@ -133,7 +133,7 @@ function brokenfocus {
     }
 
 ### MAIN
-main
+main "${1}"
 
 }
 

diff --git a/libs/versioncontrol.sh b/libs/versioncontrol.sh
@@ -42,7 +42,9 @@ versioncontrol() {
     # Camera Streamer has no version Output yet
     get_ayucamstream_version() {
         local cur_ver avail_ver
-        if [[ "$(is_raspberry_pi)" = "1" ]] && [[ "$(is_ubuntu_arm)" = "0" ]]; then
+        if [[ "$(is_raspberry_pi)" = "1" ]] &&
+        [[ "$(is_ubuntu_arm)" = "0" ]] &&
+        [[ "$(is_pi5)" = "0" ]]; then
             pushd "${BASE_CN_PATH}"/bin/camera-streamer &> /dev/null || exit 1
                 avail_ver="($(git describe --tags --always))"
                 cur_ver="$("${PWD}"/camera-streamer --version | tr -d " ")"

diff --git a/resources/crowsnest.conf b/resources/crowsnest.conf
@@ -17,6 +17,11 @@
 ####    Port 8082 equals /webcam3/?action=[stream/snapshot]     #####
 ####    Port 8083 equals /webcam4/?action=[stream/snapshot]     #####
 ####                                                            #####
+####    Note: These ports are default for most Mainsail         #####
+####    installations. To use any other port would involve      #####
+####    changing the proxy configuration or using directly      #####
+####    http://<ip>:<port>/?action=[stream/snapshot]            #####
+####                                                            #####
 #####################################################################
 ####    RTSP Stream URL: ( if enabled and supported )           #####
 ####    rtsp://<ip>:<rtsp_port>/stream.h264                     #####

diff --git a/tools/libs/build_apps.sh b/tools/libs/build_apps.sh
@@ -36,7 +36,8 @@ clone_cstreamer() {
         rm -rf bin/camera-streamer
     fi
     sudo -u "${BASE_USER}" \
-    git clone "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" --recursive \
+    git clone "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" \
+    --recurse-submodules --shallow-submodules \
     -b "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" \
     --depth=1 --single-branch bin/camera-streamer
 }

diff --git a/tools/libs/core.sh b/tools/libs/core.sh
@@ -67,6 +67,15 @@ is_raspberry_pi() {
     fi
 }
 
+is_pi5() {
+    if [[ -f /proc/device-tree/model ]] &&
+    grep -q "Raspberry Pi 5" /proc/device-tree/model; then
+        echo "1"
+    else
+        echo "0"
+    fi
+}
+
 is_ubuntu_arm() {
     if [[ "$(is_raspberry_pi)" = "1" ]] &&
     grep -q "ubuntu" /etc/os-release; then
@@ -104,6 +113,14 @@ shallow_cs_dependencies_check() {
     fi
     status_msg "Checking if device is a Raspberry Pi ..." "0"
 
+    msg "Checking if device is not a Raspberry Pi 5 ...\n"
+    if [[ "$(is_pi5)" = "1" ]]; then
+        status_msg "Checking if device is not a Raspberry Pi 5 ..." "3"
+        msg "This device is a Raspberry Pi 5 therefore camera-streeamer cannot be installed ..."
+        return 1
+    fi
+    status_msg "Checking if device is not a Raspberry Pi 5 ..." "0"
+
     msg "Checking if device is not running Ubuntu ...\n"
     if [[ "$(is_ubuntu_arm)" = "1" ]]; then
         status_msg "Checking if device is not running Ubuntu ..." "3"

diff --git a/tools/libs/set_gpumem.sh b/tools/libs/set_gpumem.sh
@@ -34,7 +34,9 @@ set_gpu_mem() {
     else
         mem_split=256
     fi
-    if [[ "$(is_raspbian)" = "1" ]] && [[ -n "$(command -v raspi-config)" ]]; then
+    if [[ "$(is_raspbian)" = "1" ]] &&
+    [[ "$(is_bookworm)" = "0" ]] &&
+    [[ -n "$(command -v raspi-config)" ]]; then
         if sudo raspi-config nonint do_memory_split "${mem_split}" ;then
             status_msg "Trying to set minimum GPU Memory to ${mem_split} MB ..." "0"
         else