[Automated] Merged develop into target master

mainsail-crew · Nov 3, 2023 · 259738d · 259738d
2 parents e69e21a + da53681
commit 259738d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 6 deletions.
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - 'master'
+      - 'develop'
     paths:
       - '**.sh'
       - 'webcamd'

diff --git a/bin/build.sh b/bin/build.sh
@@ -39,7 +39,7 @@ fi
 # Camera-streamer repo
 CSTREAMER_PATH="camera-streamer"
 if [[ -z "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]]; then
-    CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan-research/camera-streamer.git"
+    CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/ayufan/camera-streamer.git"
 fi
 if [[ -z "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]]; then
     CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master"

diff --git a/libs/camera-streamer.sh b/libs/camera-streamer.sh
@@ -87,6 +87,9 @@ function run_ayucamstream() {
     # Enable camera-auto_reconnect by default
     start_param+=( --camera-auto_reconnect=1 )
 
+    # Force camera to be always active by default
+    start_param+=( --camera-force_active=1 )
+
     # Custom Flag Handling (append to defaults)
     if [[ -n "${cstm}" ]]; then
         start_param+=( "${cstm}" )

diff --git a/libs/init_stream.sh b/libs/init_stream.sh
@@ -30,8 +30,8 @@ function construct_streamer {
                 if [[ "$(is_raspberry_pi)" = "1" ]] && [[ "$(is_ubuntu_arm)" = "0" ]]; then
                     MULTI_INSTANCES+=( "${cams}" )
                 else
-                    log_msg "WARN: Mode 'multi' is not supported on your device!"
-                    log_msg "WARN: Falling back to Mode 'mjpg'"
+                    log_msg "WARN: Mode 'camera-streamer' is not supported on your device!"
+                    log_msg "WARN: Falling back to Mode 'ustreamer'"
                     MJPG_INSTANCES+=( "${cams}" )
                 fi
             ;;

diff --git a/libs/messages.sh b/libs/messages.sh
@@ -39,13 +39,13 @@ function help_msg {
 
 function deprecated_msg_1 {
     log_msg "Parameter 'streamer' is deprecated!"
-    log_msg "Please use mode: [ mjpg | multi ]"
+    log_msg "Please use mode: [ ustreamer | camera-streamer ]"
     log_msg "ERROR: Please update your crowsnest.conf! Stopped."
 }
 
 function unknown_mode_msg {
     log_msg "WARN: Unknown Mode configured!"
-    log_msg "WARN: Using 'mode: mjpg' as fallback!"
+    log_msg "WARN: Using 'mode: ustreamer' as fallback!"
 }
 
 ## v4l2_control lib

diff --git a/tools/configure.sh b/tools/configure.sh
@@ -28,7 +28,7 @@ CN_CONFIG_ENVPATH="${CN_CONFIG_ROOTPATH}/systemd"
 CN_MOONRAKER_CONFIG_PATH="${CN_CONFIG_CONFIGPATH}/moonraker.conf"
 CN_USTREAMER_REPO="https://github.com/pikvm/ustreamer.git"
 CN_USTREAMER_BRANCH="master"
-CN_CAMERA_STREAMER_REPO="https://github.com/ayufan-research/camera-streamer.git"
+CN_CAMERA_STREAMER_REPO="https://github.com/ayufan/camera-streamer.git"
 CN_CAMERA_STREAMER_BRANCH="master"
 
 ### Messages

diff --git a/tools/install.sh b/tools/install.sh
@@ -128,6 +128,12 @@ main() {
 
     add_group_video
 
+    if [[ "$(is_bookworm)" = "1" ]]; then
+        msg "Bookworm detected!"
+        msg "Using main branch of camera-streamer for Bookworm..."
+        CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="main"
+    fi
+
     build_apps
 
     if [[ "${CROWSNEST_UNATTENDED}" = "0" ]]; then

diff --git a/tools/libs/core.sh b/tools/libs/core.sh
@@ -34,6 +34,12 @@ is_buster() {
     fi
 }
 
+is_bookworm() {
+    if [[ -f /etc/os-release ]]; then
+        grep -cq "bookworm" /etc/os-release &> /dev/null && echo "1" || echo "0"
+    fi
+}
+
 is_raspbian() {
     if [[ -f /boot/config.txt ]] && [[ -f /etc/rpi-issue ]]; then
         echo "1"