voltron/octodocker_deploy
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ustreamer

Browse Source
This commit is contained in:
paukstelis
2022-05-16 18:08:45 -04:00
parent 0a973a12c4
commit b64e4e3d0f
3 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
octocam_generic.service
View File

@@ -1,12 +0,0 @@
[Unit]
Description=the OctoPi(buntu) webcam daemon with the user specified config
After=network.online.target
Wants=network.online.target
[Service]
User=OCTOUSER
Environment="LD_LIBRARY_PATH=/home/OCTOUSER/mjpg-streamer"
ExecStart=/home/OCTOUSER/mjpg-streamer/mjpg_streamer -i "input_uvc.so -d /dev/OCTOCAM -r RESOLUTION -f FRAMERATE" -o "output_http.so -p CAMPORT"
[Install]
WantedBy=multi-user.target

5
octocam_ustream.service
View File

@@ -1,12 +1,11 @@
[Unit] [Unit]
Description=the OctoPi(buntu) webcam daemon with the user specified config Description=the OctoPi(buntu) ustreamer daemon with the user specified config
After=network.online.target After=network.online.target
Wants=network.online.target Wants=network.online.target
[Service] [Service]
User=OCTOUSER User=OCTOUSER
Environment="LD_LIBRARY_PATH=/home/OCTOUSER/mjpg-streamer" ExecStart=/home/OCTOUSER/ustreamer/ustreamer -d /dev/OCTOCAM -m MJPEG -r RESOLUTION -f FRAMERATE -p CAMPORT --device-timeout 8 --device-error-delay 8
ExecStart=/home/OCTOUSER/mjpg-streamer/mjpg_streamer -i "input_uvc.so -d /dev/OCTOCAM -r RESOLUTION -f FRAMERATE" -o "output_http.so -p CAMPORT"
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

4
octoprint_deploy.sh
View File

@@ -401,7 +401,7 @@ add_camera() {
fi fi
echo "Selected camera resolution: $RESOLUTION" | log echo "Selected camera resolution: $RESOLUTION" | log
#TODO check formating #TODO check formating
echo "Camera Framerate (no sanity check, so get it right) [default: 5]:" echo "Camera Framerate (use 0 for ustreamer hardware) [default: 5]:"
read FRAMERATE read FRAMERATE
if [ -z "$FRAMERATE" ]; then if [ -z "$FRAMERATE" ]; then
FRAMERATE=5 FRAMERATE=5
@@ -726,6 +726,8 @@ remove_everything() {
echo "Removing template" echo "Removing template"
rm -rf /home/$user/.octoprint rm -rf /home/$user/.octoprint
rm -rf /home/$user/OctoPrint rm -rf /home/$user/OctoPrint
systemctl daemon-reload
fi fi