From ff14e332f91a43b6aa1683cbd6ef30fdb962b94f Mon Sep 17 00:00:00 2001 From: paukstelis Date: Mon, 1 Apr 2024 15:08:51 -0400 Subject: [PATCH] camera-streamer Picam --- README.md | 3 ++- cameras.sh | 2 +- menu.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 06de2b9..4fd9b83 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -Updated March 11, 2024. +Updated April 1, 2024. Want to support this work? Buy Me a Coffee. https://www.buymeacoffee.com/ppaukstelis. Need help with octoprint_deploy? Visit support-octoprint-deploy on the OctoPrint Discord: https://discord.com/invite/yA7stPp @@ -63,6 +63,7 @@ Need help with octoprint_deploy? Visit support-octoprint-deploy on the OctoPrint * Restart all instances from the command line: `sudo octoprint_deploy/octoprint_deploy.sh restart_all` * You can inject any function at start using the command line with the first argument `f` and the second argument the function name. # Recent Changes + * Fixes for adding PiCam with camera-streamer (still not complete) * Add camera-streamer as an option. This is also coupled with adding PiCam from the menu. __THIS IS EXPERIMENTAL and NEEDS TESTING__ * Fix an issue with Fedora python versioning. * Fix change for ustreamer executable being renamed ustreamer.bin diff --git a/cameras.sh b/cameras.sh index 9c55f24..6e87976 100755 --- a/cameras.sh +++ b/cameras.sh @@ -74,7 +74,7 @@ write_camera() { #camera-streamer if [ "$STREAMER" == camera-streamer ]; then - if [ "$PICAM" == true ]; then + if [ "$PI" == true ]; then cat $SCRIPTDIR/picam_camstream.service | \ sed -e "s/OCTOUSER/$OCTOUSER/" \ -e "s/OCTOCAM/cam${INUM}_$INSTANCE/" > $SCRIPTDIR/$OUTFILE.service diff --git a/menu.sh b/menu.sh index a9c2738..e4c722e 100644 --- a/menu.sh +++ b/menu.sh @@ -9,7 +9,7 @@ yellow=$(echo -en "\e[93m") main_menu() { - VERSION=1.0.10 + VERSION=1.0.11 #reset UDEV='' TEMPUSB=''