Skip to content

Commit 8447f72

Browse files
committed
Update octopi.txt without raspicam mentions
If necessary, see discussion in guysoft/OctoPi#796
1 parent 2110277 commit 8447f72

2 files changed

Lines changed: 91 additions & 0 deletions

File tree

scripts/81-fix-octopi-txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
set -x
2+
set -e
3+
4+
export LC_ALL=C
5+
6+
source /common.sh
7+
install_cleanup_trap
8+
9+
# if input_raspi.so is there, we don't need to do anything
10+
[ -f /opt/mjpg-streamer/input_raspi.so ] && exit 0
11+
12+
# if we already have the octopi.txt file updated, we don't need to do anything
13+
grep -q '### Configure which camera to use' /boot/octopi.txt || exit 0
14+
15+
cp /files/octopi.txt /boot/octopi.txt

scripts/files/octopi.txt

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
### Windows users: To edit this file use Notepad++, VSCode, Atom or SublimeText.
2+
### Do not use Notepad or WordPad.
3+
4+
### MacOSX users: If you use Textedit to edit this file make sure to use
5+
### "plain text format" and "disable smart quotes" in "Textedit > Preferences"
6+
7+
### Heads-up: The "input_raspicam" input module of mjpg-streamer is no longer supported.
8+
### Raspicam support is now available on the "input_uvc" module.
9+
10+
### Additional options to supply to MJPG Streamer for the USB camera
11+
#
12+
# See https://faq.octoprint.org/mjpg-streamer-config for available options
13+
#
14+
# Defaults to a resolution of 640x480 px and a framerate of 10 fps
15+
#
16+
#camera_usb_options="-r 640x480 -f 10"
17+
18+
### Additional webcam devices known to cause problems with -f
19+
#
20+
# Apparently there a some devices out there that with the current
21+
# mjpg_streamer release do not support the -f parameter (for specifying
22+
# the capturing framerate) and will just refuse to output an image if it
23+
# is supplied.
24+
#
25+
# The webcam daemon will detect those devices by their USB Vendor and Product
26+
# ID and remove the -f parameter from the options provided to mjpg_streamer.
27+
#
28+
# By default, this is done for the following devices:
29+
# Logitech C170 (046d:082b)
30+
# GEMBIRD (1908:2310)
31+
# Genius F100 (0458:708c)
32+
# Cubeternet GL-UPC822 UVC WebCam (1e4e:0102)
33+
#
34+
# Using the following option it is possible to add additional devices. If
35+
# your webcam happens to show above symptoms, try determining your cam's
36+
# vendor and product id via lsusb, activating the line below by removing # and
37+
# adding it, e.g. for two broken cameras "aabb:ccdd" and "aabb:eeff"
38+
#
39+
# additional_brokenfps_usb_devices=("aabb:ccdd" "aabb:eeff")
40+
#
41+
# If this fixes your problem, please report it back so we can include the device
42+
# out of the box: https://github.com/guysoft/OctoPi/issues
43+
#
44+
#additional_brokenfps_usb_devices=()
45+
46+
### Configuration of camera HTTP output
47+
#
48+
# Usually you should NOT need to change this at all! Only touch if you
49+
# know what you are doing and what the parameters mean.
50+
#
51+
# Below settings are used in the mjpg-streamer call like this:
52+
#
53+
# -o "output_http.so -w $camera_http_webroot $camera_http_options"
54+
#
55+
# Current working directory is the mjpg-streamer base directory.
56+
#
57+
#camera_http_webroot="./www-octopi"
58+
#camera_http_options="-n"
59+
60+
# Configuration of network monitoring
61+
#
62+
# This enables network monitoring for wifi connections with a simple ping test.
63+
# If connection terminates by variable reasons system tries to restart the wifi connection to reestablish a connection.
64+
# The connection test is done every minute.
65+
# By default it is disabled (0 = off / 1 = on)
66+
# destination_host can be an ip address or a hostname (for hostname ensure dns resosultion is working correctly)
67+
enable_network_monitor=0
68+
destination_host=192.168.1.1
69+
70+
### EXPERIMENTAL
71+
# Support for different streamer types.
72+
#
73+
# Available options:
74+
# mjpeg [default] - stable MJPG-streamer
75+
# hls - experimental FFMPEG HLS streamer
76+
#camera_streamer=mjpeg

0 commit comments

Comments
 (0)