Use overrides to persist user configuration

- Use override file to persist user's camera configuration

Author: horzadome

docs/camera_support.md

@@ -10,6 +10,7 @@ The extended firmware includes hardware-accelerated camera support.
 - v4l2-mpp: MIPI CSI and USB camera support
 - WebRTC low-latency streaming
 - Hot-plug detection for USB cameras
+- Ability to select different stream types (WebRTC, MJPEG-adaptive, h264 iframe...)
 
 ## Accessing Cameras
 
@@ -29,52 +30,39 @@ Access USB camera at:
 http://<printer-ip>/webcam2/
 ```
 
-You need to add USB camera in Fluidd. Use the following
-settings for the best performance:
+You need to add USB camera to Fluidd. Use the following settings for the best performance:
 
 <img src="images/usb_cam.png" alt="Fluidd USB camera" width="300"/>
 
-## Change Internal Camera Stream Type
+Alternatively, you can add USB camera to Moonraker configuration which also makes it available in Fluidd and all other Moonraker clients:
+
+1. In web browser go to Fluidd Configuration editor at `http://<printer-ip>/#/configure`
+2. Enter `moonraker` directory and right-click on `03_usb_camera.cfg.disabled` and rename it to `03_usb_camera.cfg`
+5. Restart Moonraker service or printer for changes to take effect.
 
-By default the internal camera stream uses WebRTC for low-latency streaming.
-Not all apps/integrations support WebRTC.
-To switch internal camera to MJPEG or h264 stream, simply rename existing preset files using either Fluidd or SSH interface:
+## Change Internal Camera Stream Type
 
-<details>
-<summary>Click to expand Fluidd instructions</summary>
+By default the internal "case" camera streams in WebRTC format for low-latency and high-quality video.
+Some apps don't support WebRTC (Mobileraker, Homeassistant...), so you may want to switch the default stream type to MJPEG or h264 instead. Or you can have multiple stream types enabled at the same time and client apps can choose the one that works for them.
+To do that, simply rename the existing `09_user_camera.cfg.disabled` to `09_user_camera.cfg`. You can do that from Fluidd web interface:
 
 1. In web browser go to Fluidd Configuration editor at `http://<printer-ip>/#/configure`
-2. Enter `moonraker` directory and right-click on the preset files to rename them
-    - Disable WebRTC stream to prevent having multiple cameras in Fluidd:
-      - Rename `02_webrtc_internal_camera.cfg` to `02_webrtc_internal_camera.cfg.disabled`
-    - Enable mjpg-adaptive stream:
-      - Rename `03_mjpg_internal_camera.cfg.disabled` to `03_mjpg_internal_camera.cfg`
-    - Enable h264 stream:
-      - Rename `04_h264_internal_camera.cfg.disabled` to `04_h264_internal_camera.cfg`
-
-</details>
-
-<details>
-<summary>Click to expand SSH instructions</summary>
-
-```bash
-# Disable WebRTC stream to prevent having multiple cameras in Fluidd
-cd /home/lava/printer_data/config/moonraker/
-mv 02_webrtc_internal_camera.cfg 02_webrtc_internal_camera.cfg.disabled
-
-# Enable mjpg-adaptive stream
-cd /home/lava/printer_data/config/moonraker/
-mv 03_mjpg_internal_camera.cfg.disabled 03_mjpg_internal_camera.cfg
-
-# Enable h264 stream
-cd /home/lava/printer_data/config/moonraker/
-mv 04_h264_internal_camera.cfg.disabled 04_h264_internal_camera.cfg
-
-# Restart moonraker to apply changes
-/etc/init.d/S61moonraker restart
-```
+2. Enter `moonraker` directory, right-click on `09_user_camera.cfg.disabled` and rename it to `09_user_camera.cfg`
+    That file contains a section which disables default WebRTC stream:
+
+    ```ini
+    [webcam case]
+    enabled: false
+    ```
+
+    If you prefer to keep the WebRTC stream enabled, simply toggle it to `enabled: true` and modify its settings as needed.
+
+3. Edit any other webcam sections to enable other stream types and configure their settings.
+   Refer to [09_user_camera.cfg.disabled](../overlays/camera-v4l2-mpp/root/home/lava/origin_printer_data/config/moonraker/09_user_camera.cfg.disabled) content for examples.
+4. Save the changes
+5. Restart Moonraker service or printer for changes to take effect.
 
-</details>
+Refer to official [Moonraker documentation](https://moonraker.readthedocs.io/en/latest/configuration/#webcam) for more details on available webcam settings.
 
 ## Switch to Snapmaker's Original Camera Stack
 

overlays/camera-v4l2-mpp/root/home/lava/origin_printer_data/config/moonraker/02_default_internal_camera.cfg

@@ -0,0 +1,17 @@
+# DO NOT EDIT OR DELETE THIS FILE
+# Firmware update will overwrite this file!
+# Instead, rename 09_user_camera.cfg.disabled to 09_user_camera.cfg and edit that file.
+# In that file you can disable this default camera by setting:
+# [webcam case]
+# enabled: false
+# Follow instructions in 09_user_camera.cfg.disabled to customize this camera; do not edit it here.
+
+# Default internal camera using WebRTC, do not edit here.
+[webcam case]
+enabled: true
+service: webrtc-camerastreamer
+stream_url: /webcam/webrtc
+snapshot_url: /webcam/snapshot.jpg
+aspect_ratio: 16:9
+target_fps: 15
+target_fps_idle: 1

overlays/camera-v4l2-mpp/root/home/lava/origin_printer_data/config/moonraker/02_webrtc_internal_camera.cfg

@@ -0,0 +1,11 @@
+# To add USB camera to Moonraker and all of its clients (Fluidd), simply rename this file to 03_usb_camera.cfg
+
+# USB camera using WebRTC
+[webcam usb]
+enabled: true
+service: webrtc-camerastreamer
+stream_url: /webcam2/webrtc
+snapshot_url: /webcam2/snapshot.jpg
+aspect_ratio: 16:9
+target_fps: 15
+target_fps_idle: 1

overlays/camera-v4l2-mpp/root/home/lava/origin_printer_data/config/moonraker/03_mjpg_internal_camera.cfg.disabled

@@ -0,0 +1,41 @@
+# To customize camera streams:
+# 1. Rename this file to 09_user_camera.cfg using Fluidd web interface or SSH shell.
+# 2. Enable stream types that you want by changing "enabled" to true.
+#    Enabling multiple stream types will add multiple cameras to Fluidd and other clients.
+# 3. Feel free to adjust other parameters as needed.
+
+
+# Default Internal camera using WebRTC
+# This webcam must be named "case" to override default settings from 02_default_internal_camera.cfg
+# Enabling this camera and modifying its settings here will override default settings from 02_default_internal_camera.cfg
+[webcam case]
+enabled: false
+service: webrtc-camerastreamer
+stream_url: /webcam/webrtc
+snapshot_url: /webcam/snapshot.jpg
+aspect_ratio: 16:9
+target_fps: 15
+target_fps_idle: 1
+
+# Internal camera using MJPEG-adaptive, enable by setting "enabled: true"
+[webcam mjpeg]
+enabled: false
+service: mjpegstreamer-adaptive
+stream_url: /webcam/stream.mjpg
+snapshot_url: /webcam/snapshot.jpg
+aspect_ratio: 16:9
+target_fps: 15
+target_fps_idle: 1
+
+# Internal camera using h264 embedded player, enable by setting "enabled: true"
+[webcam h264]
+enabled: false
+service: iframe
+stream_url: /webcam/player
+snapshot_url: /webcam/snapshot.jpg
+aspect_ratio: 16:9
+target_fps: 15
+target_fps_idle: 1
+
+# More stream types and parameters can be added using syntax from official Moonraker documentation.
+# https://moonraker.readthedocs.io/en/latest/configuration/#webcam