Skip to content

Commit

Permalink
[Automated] Merged develop into target master
Browse files Browse the repository at this point in the history
  • Loading branch information
mryel00 authored Nov 2, 2023
2 parents e69e21a + 5c040f2 commit 24629e2
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions libs/init_stream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand Down
4 changes: 2 additions & 2 deletions libs/messages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions tools/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions tools/libs/core.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 24629e2

Please sign in to comment.