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 Oct 27, 2023
2 parents 0029bee + ae2bc21 commit 8eef6c6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
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

0 comments on commit 8eef6c6

Please sign in to comment.