camera-streamer Picam

This commit is contained in:
paukstelis
2024-04-01 15:08:51 -04:00
parent af7162a108
commit ff14e332f9
3 changed files with 4 additions and 3 deletions

View File

@@ -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. 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 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` * 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. * 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 # 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__ * 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 an issue with Fedora python versioning.
* Fix change for ustreamer executable being renamed ustreamer.bin * Fix change for ustreamer executable being renamed ustreamer.bin

View File

@@ -74,7 +74,7 @@ write_camera() {
#camera-streamer #camera-streamer
if [ "$STREAMER" == camera-streamer ]; then if [ "$STREAMER" == camera-streamer ]; then
if [ "$PICAM" == true ]; then if [ "$PI" == true ]; then
cat $SCRIPTDIR/picam_camstream.service | \ cat $SCRIPTDIR/picam_camstream.service | \
sed -e "s/OCTOUSER/$OCTOUSER/" \ sed -e "s/OCTOUSER/$OCTOUSER/" \
-e "s/OCTOCAM/cam${INUM}_$INSTANCE/" > $SCRIPTDIR/$OUTFILE.service -e "s/OCTOCAM/cam${INUM}_$INSTANCE/" > $SCRIPTDIR/$OUTFILE.service

View File

@@ -9,7 +9,7 @@ yellow=$(echo -en "\e[93m")
main_menu() { main_menu() {
VERSION=1.0.10 VERSION=1.0.11
#reset #reset
UDEV='' UDEV=''
TEMPUSB='' TEMPUSB=''