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
meteyou authored Jan 16, 2024
2 parents e209d19 + 65fc96a commit c81b00f
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 18 deletions.
10 changes: 6 additions & 4 deletions .github/label-actions.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Configuration for Label Actions - https://github.com/dessant/label-actions

not on Github:
not an Issue:
issues:
comment: |
Ahoi!
Expand All @@ -9,10 +9,12 @@ not on Github:
Many helpful people will not see your message here and you are
unlikely to get a useful response.
We use github to handle bugreports, feature requests and
planning new releases.
We use the Github Issue-Tracker only for development related
topics, like feature requests, bug reports etc. To get help,
please join our Discord-Server or ask in Github Discussions:
Please use our Discord-Server for help: [discord.gg/mainsail](https://discord.gg/mainsail)
- [discord.gg/mainsail](https://discord.gg/mainsail)
- [GitHub Discussions](https://github.com/orgs/mainsail-crew/discussions)
This ticket will be automatically closed.
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ help: ## Shows this help
update: ## Update crowsnest (fetches and pulls repository changes)
@git fetch && git pull
@bash -c 'bin/build.sh --reclone'
${MAKE} buildclean
${MAKE} build

report: ## Generate report.txt
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ Not available: :heavy_minus_sign:

| Operating System | X86 Architecture | ARM Architecture |
| :-------------------------------: | :----------------: | :-----------------------------------------: |
| Raspberry Pi OS (buster) | :heavy_minus_sign: | :x: ([Hint](#hint)) |
| Raspberry Pi OS (buster) | :heavy_minus_sign: | :x: ([Hint](#hint-buster)) |
| Raspberry Pi OS (bullseye) | :heavy_minus_sign: | :heavy_check_mark: |
| Raspberry Pi OS (bookworm) | :heavy_minus_sign: | :heavy_check_mark: ([Hint](#hint-bookworm)) |
| MainsailOS (<0.7.1) | :heavy_minus_sign: | :x: ([Hint](#hint)) |
| MainsailOS (<0.7.1) | :heavy_minus_sign: | :x: ([Hint](#hint-buster)) |
| MainsailOS (>1.0.0) | :heavy_minus_sign: | :heavy_check_mark: (rpi) |
| Armbian | :question: | :heavy_check_mark: |
| DietPi | :question: | :heavy_check_mark: (rpi) |
Expand Down
22 changes: 14 additions & 8 deletions bin/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
#### crowsnest - A webcam Service for multiple Cams and Stream Services.
####
#### Written by Stephan Wendel aka KwadFan <me@stephanwe.de>
#### Copyright 2021 - till today
#### Copyright 2021 - 2024
#### Co-authored by Patrick Gehrsitz aka mryel00 <mryel00.github@gmail.com>
#### Copyright 2024 - till today
#### https://github.com/mainsail-crew/crowsnest
####
#### This File is distributed under GPLv3
Expand Down Expand Up @@ -107,10 +109,10 @@ get_avail_mem() {
delete_apps() {
for path in "${ALL_PATHS[@]}"; do
if [[ ! -d "${path}" ]]; then
printf "'%s' does not exist! Delete skipped ...\n" "${path}"
printf "'%s' does not exist! Delete ... [SKIPPED]\n" "${path}"
fi
if [[ -d "${path}" ]]; then
printf "Deleting '%s' ... \n" "${path}"
printf "Deleting '%s' ... [DONE]\n" "${path}"
rm -rf "${path}"
fi
done
Expand All @@ -136,7 +138,7 @@ clone_cstreamer() {
[[ "$(is_pi5)" = "1" ]] ||
[[ "$(is_ubuntu_arm)" = "1" ]]; } &&
[[ "${CROWSNEST_UNATTENDED}" = "0" ]]; then
printf "WARN: Cloning camera-streamer skipped! Device is not supported!"
printf "Device is not supported! Cloning camera-streamer ... [SKIPPED]\n"
return
fi
if [[ -d "${BASE_CN_BIN_PATH}"/"${CSTREAMER_PATH}" ]]; then
Expand Down Expand Up @@ -166,10 +168,14 @@ clone_apps() {
### Run 'make clean' in cloned folders
clean_apps() {
for app in "${ALL_PATHS[@]}"; do
printf "\nRunning 'make clean' in %s ... \n" "${app}"
pushd "${app}" &> /dev/null || exit 1
make clean
popd &> /dev/null || exit 1
if [[ ! -d "${app}" ]]; then
printf "'%s' does not exist! Clean ... [SKIPPED]\n" "${app}"
else
printf "\nRunning 'make clean' in %s ... \n" "${app}"
pushd "${app}" &> /dev/null || exit 1
make clean
popd &> /dev/null || exit 1
fi
done
printf "\nRunning 'make clean' ... [DONE]\n"
}
Expand Down
2 changes: 1 addition & 1 deletion libs/hwhandler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ detect_libcamera() {
[[ -x "$(command -v libcamera-hello)" ]]; then
avail="$(libcamera-hello --list-cameras | sed '/^\[.*\].*/d' | awk 'NR==1 {print $1}')"
if [[ "${avail}" = "Available" ]]; then
echo "1"
get_libcamera_path | wc -l
else
echo "0"
fi
Expand Down
11 changes: 9 additions & 2 deletions libs/logging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function print_cfg {
}

function print_cams {
local total v4l
local device total v4l
v4l="$(find /dev/v4l/by-id/ -iname "*index0" 2> /dev/null | wc -l)"
libcamera="$(detect_libcamera)"
legacy="$(detect_legacy)"
Expand All @@ -100,7 +100,14 @@ function print_cams {
log_msg "INFO: Found ${total} total available Device(s)"
fi
if [[ "${libcamera}" -ne 0 ]]; then
log_msg "Detected 'libcamera' device -> $(get_libcamera_path)"
if [[ "$(is_pi5)" = "1" ]]; then
log_msg "================================================================"
log_msg " WARN: 'libcamera' devices are currently not supported on Pi 5! "
log_msg "================================================================"
fi
for device in $(get_libcamera_path); do
log_msg "Detected 'libcamera' device -> ${device}"
done
fi
if [[ "${legacy}" -ne 0 ]]; then
raspicam="$(v4l2-ctl --list-devices | grep -A1 -e 'mmal' | \
Expand Down

0 comments on commit c81b00f

Please sign in to comment.