diff --git a/webcam-multi.txt b/webcam-xk.txt similarity index 96% rename from webcam-multi.txt rename to webcam-xk.txt index 5880078..e6af7ca 100644 --- a/webcam-multi.txt +++ b/webcam-xk.txt @@ -1,7 +1,7 @@ # vim: ft=conf ### Additional options to supply to MJPG Streamer for the cameras -camera_usb=1 +camera_usb=0 camera_raspi=1 camera_usb_options="-d /dev/v4l/by-id/usb-Vimicro_Corp._HBVCAM_FHD_CAMERA-video-index0 -r 1280x960 -f 10" camera_raspi_options="-d /dev/v4l/by-path/platform-bcm2835-isp-video-index0 -x 1024 -y 768 -roi 0.0,0.0,0.998,1" diff --git a/webcam.txt b/webcam.txt deleted file mode 100644 index b42becf..0000000 --- a/webcam.txt +++ /dev/null @@ -1,79 +0,0 @@ -# vim: ft=conf - -### Configure which camera to use -# -# Available options are: -# - auto: tries first usb webcam, if that's not available tries raspi cam -# - usb: only tries usb webcam -# - raspi: only tries raspi cam -# -# Defaults to auto -# -camera="raspi" - -### Additional options to supply to MJPG Streamer for the USB camera -# -# See https://faq.octoprint.org/mjpg-streamer-config for available options -# -# Defaults to a resolution of 640x480 px and a framerate of 10 fps -# -#camera_usb_options="-r 640x480 -f 10" -camera_usb_options="-r 800x600 -f 10" - -### Additional webcam devices known to cause problems with -f -# -# Apparently there a some devices out there that with the current -# mjpg_streamer release do not support the -f parameter (for specifying -# the capturing framerate) and will just refuse to output an image if it -# is supplied. -# -# The webcam daemon will detect those devices by their USB Vendor and Product -# ID and remove the -f parameter from the options provided to mjpg_streamer. -# -# By default, this is done for the following devices: -# Logitech C170 (046d:082b) -# GEMBIRD (1908:2310) -# Genius F100 (0458:708c) -# Cubeternet GL-UPC822 UVC WebCam (1e4e:0102) -# -# Using the following option it is possible to add additional devices. If -# your webcam happens to show above symptoms, try determining your cam's -# vendor and product id via lsusb, activating the line below by removing # and -# adding it, e.g. for two broken cameras "aabb:ccdd" and "aabb:eeff" -# -# additional_brokenfps_usb_devices=("aabb:ccdd" "aabb:eeff") -# -# -#additional_brokenfps_usb_devices=() - -### Additional options to supply to MJPG Streamer for the RasPi Cam -# -# See https://faq.octoprint.org/mjpg-streamer-config for available options -# -# Defaults to 10fps -# -# camera_raspi_options="-x 800 -y 600 -fps 10 -roi 0.0,0.0,0.998,1 -rot 180" -# camera_raspi_options="-x 800 -y 600 -fps 10 -roi 0.0,0.0,0.998,1" -# camera_raspi_options="-x 800 -y 600 -roi 0.0,0.0,0.998,1" -camera_raspi_options="-x 1024 -y 768 -roi 0.0,0.0,0.998,1" - -### Configuration of camera HTTP output -# -# Usually you should NOT need to change this at all! Only touch if you -# know what you are doing and what the parameters mean. -# -# Below settings are used in the mjpg-streamer call like this: -# -# -o "output_http.so -w $camera_http_webroot $camera_http_options" -# -# Current working directory is the mjpg-streamer base directory. -# -#camera_http_webroot="./www-fluidd" -#camera_http_options="-n" - -### EXPERIMENTAL -# Support for different streamer types. -# -# Available options: -# mjpeg [default] - stable MJPG-streamer -#camera_streamer=mjpeg