Skip to content

Commit e5ed4bd

Browse files
authored
[Automated] Merged develop into target master
2 parents dd390b6 + 5b6c88d commit e5ed4bd

File tree

8 files changed

+55
-19
lines changed

8 files changed

+55
-19
lines changed

bin/build.sh

+11-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if [[ -z "${CROWSNEST_USTREAMER_REPO_SHIP}" ]]; then
3535
CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git"
3636
fi
3737
if [[ -z "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]]; then
38-
CROWSNEST_USTREAMER_REPO_BRANCH="v6.10"
38+
CROWSNEST_USTREAMER_REPO_BRANCH="v6.31"
3939
fi
4040

4141
# Camera-streamer repo
@@ -99,6 +99,14 @@ is_ubuntu_arm() {
9999
fi
100100
}
101101

102+
is_armbian() {
103+
if grep -q "Armbian" /etc/os-release; then
104+
echo "1"
105+
else
106+
echo "0"
107+
fi
108+
}
109+
102110
### Get avail mem
103111
get_avail_mem() {
104112
grep "MemTotal" /proc/meminfo | awk '{print $2}'
@@ -136,7 +144,8 @@ clone_cstreamer() {
136144
[[ -n "${CROWSNEST_UNATTENDED}" ]] || CROWSNEST_UNATTENDED="0"
137145
if { [[ "$(is_raspberry_pi)" = "0" ]] ||
138146
[[ "$(is_pi5)" = "1" ]] ||
139-
[[ "$(is_ubuntu_arm)" = "1" ]]; } &&
147+
[[ "$(is_ubuntu_arm)" = "1" ]] ||
148+
[[ "$(is_armbian)" = "1" ]]; } &&
140149
[[ "${CROWSNEST_UNATTENDED}" = "0" ]]; then
141150
printf "Device is not supported! Cloning camera-streamer ... [SKIPPED]\n"
142151
return

libs/core.sh

+1
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ function check_apps {
9797
## Avoid dependency check if non rpi sbc
9898
if [[ "$(is_raspberry_pi)" = "1" ]] &&
9999
[[ "$(is_ubuntu_arm)" = "0" ]] &&
100+
[[ "$(is_armbian)" = "0" ]] &&
100101
[[ "$(is_pi5)" = "0" ]]; then
101102
if [[ -x "${BASE_CN_PATH}/${cstreamer}" ]]; then
102103
log_msg "Dependency: '${cstreamer##*/}' found in ${cstreamer}."

libs/hwhandler.sh

+8
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,11 @@ is_ubuntu_arm() {
185185
echo "0"
186186
fi
187187
}
188+
189+
is_armbian() {
190+
if grep -q "Armbian" /etc/os-release; then
191+
echo "1"
192+
else
193+
echo "0"
194+
fi
195+
}

libs/init_stream.sh

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ function construct_streamer {
2929
[mM]ulti | camera-streamer)
3030
if [[ "$(is_raspberry_pi)" = "1" ]] &&
3131
[[ "$(is_ubuntu_arm)" = "0" ]] &&
32+
[[ "$(is_armbian)" = "0" ]] &&
3233
[[ "$(is_pi5)" = "0" ]]; then
3334
MULTI_INSTANCES+=( "${cams}" )
3435
else

libs/versioncontrol.sh

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ versioncontrol() {
4444
local cur_ver avail_ver
4545
if [[ "$(is_raspberry_pi)" = "1" ]] &&
4646
[[ "$(is_ubuntu_arm)" = "0" ]] &&
47+
[[ "$(is_armbian)" = "0" ]] &&
4748
[[ "$(is_pi5)" = "0" ]]; then
4849
pushd "${BASE_CN_PATH}"/bin/camera-streamer &> /dev/null || exit 1
4950
avail_ver="($(git describe --tags --always))"

resources/crowsnest.conf

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#### crowsnest.conf
2-
#### This is a typical default config.
3-
#### Also used as default in mainsail / MainsailOS
4-
#### See:
2+
#### This is the default config after installation.
3+
#### It is also used as the default config in MainsailOS.
4+
#### For details on how to configure this to your needs, see:
55
#### https://github.com/mainsail-crew/crowsnest/blob/master/README.md
6-
#### for details to configure to your needs.
76

87

98
#####################################################################
@@ -18,8 +17,9 @@
1817
#### Port 8083 equals /webcam4/?action=[stream/snapshot] #####
1918
#### #####
2019
#### Note: These ports are default for most Mainsail #####
21-
#### installations. To use any other port would involve #####
22-
#### changing the proxy configuration or using directly #####
20+
#### installations. Using any other port would involve #####
21+
#### changing the proxy configuration or using URLs #####
22+
#### with the specific port like #####
2323
#### http://<ip>:<port>/?action=[stream/snapshot] #####
2424
#### #####
2525
#####################################################################
@@ -32,16 +32,16 @@
3232
log_path: %LOGPATH%
3333
log_level: verbose # Valid Options are quiet/verbose/debug
3434
delete_log: false # Deletes log on every restart, if set to true
35-
no_proxy: false
35+
no_proxy: false # If set to true, no reverse proxy is required. Only change this, if you know what you are doing.
3636

3737
[cam 1]
38-
mode: ustreamer # ustreamer - Provides mjpg and snapshots. (All devices)
39-
# camera-streamer - Provides webrtc, mjpg and snapshots. (rpi + Raspi OS based only)
40-
enable_rtsp: false # If camera-streamer is used, this enables also usage of an rtsp server
38+
mode: ustreamer # ustreamer - Provides MJPG and snapshots. (All devices)
39+
# camera-streamer - Provides WebRTC, MJPG and snapshots. (only RPiOS + RPi 0/1/2/3/4)
40+
enable_rtsp: false # If camera-streamer is used, this also enables usage of an RTSP server
4141
rtsp_port: 8554 # Set different ports for each device!
42-
port: 8080 # HTTP/MJPG Stream/Snapshot Port
43-
device: /dev/video0 # See Log for available ...
44-
resolution: 640x480 # widthxheight format
45-
max_fps: 15 # If Hardware Supports this it will be forced, otherwise ignored/coerced.
46-
#custom_flags: # You can run the Stream Services with custom flags.
47-
#v4l2ctl: # Add v4l2-ctl parameters to setup your camera, see Log what your cam is capable of.
42+
port: 8080 # HTTP/MJPG stream/snapshot port
43+
device: /dev/video0 # See log for available devices
44+
resolution: 640x480 # <width>x<height> format
45+
max_fps: 15 # If hardware supports it, it will be forced, otherwise ignored/coerced.
46+
#custom_flags: # You can run the stream services with custom flags.
47+
#v4l2ctl: # Add v4l2-ctl parameters to setup your camera, see log for your camera capabilities.

tools/libs/config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import_config() {
3636
[[ -n "${CROWSNEST_LOG_PATH}" ]] || CROWSNEST_LOG_PATH="/home/${BASE_USER}/printer_data/logs"
3737
[[ -n "${CROWSNEST_ENV_PATH}" ]] || CROWSNEST_ENV_PATH="/home/${BASE_USER}/printer_data/systemd"
3838
[[ -n "${CROWSNEST_USTREAMER_REPO_SHIP}" ]] || CROWSNEST_USTREAMER_REPO_SHIP="https://github.com/pikvm/ustreamer.git"
39-
[[ -n "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="v6.10"
39+
[[ -n "${CROWSNEST_USTREAMER_REPO_BRANCH}" ]] || CROWSNEST_USTREAMER_REPO_BRANCH="v6.31"
4040
[[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_SHIP}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_SHIP="https://github.com/mryel00/camera-streamer.git"
4141
[[ -n "${CROWSNEST_CAMERA_STREAMER_REPO_BRANCH}" ]] || CROWSNEST_CAMERA_STREAMER_REPO_BRANCH="master"
4242
status_msg "Using default configuration ..." "0"

tools/libs/core.sh

+16
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,14 @@ is_ubuntu_arm() {
8585
fi
8686
}
8787

88+
is_armbian() {
89+
if grep -q "Armbian" /etc/os-release; then
90+
echo "1"
91+
else
92+
echo "0"
93+
fi
94+
}
95+
8896
is_speederpad() {
8997
if grep -q "Ubuntu 20.04." /etc/os-release &&
9098
[[ "$(uname -rm)" = "4.9.191 aarch64" ]]; then
@@ -129,6 +137,14 @@ shallow_cs_dependencies_check() {
129137
fi
130138
status_msg "Checking if device is not running Ubuntu ..." "0"
131139

140+
msg "Checking if device is not running Armbian ...\n"
141+
if [[ "$(is_armbian)" = "1" ]]; then
142+
status_msg "Checking if device is not running Armbian ..." "3"
143+
msg "This device is running Armbian therefore camera-streeamer cannot be installed ..."
144+
return 1
145+
fi
146+
status_msg "Checking if device is not running Armbian ..." "0"
147+
132148
msg "Checking for required kernel module ...\n"
133149
SHALLOW_CHECK_MODULESLIST="bcm2835_codec"
134150
if [[ "$(test_load_module ${SHALLOW_CHECK_MODULESLIST})" = "0" ]]; then

0 commit comments

Comments
 (0)