readme, add ffmpeg

.vscode/settings.json

@@ -0,0 +1,27 @@
+{
+    "MicroPython.executeButton": [
+        {
+            "text": "▶",
+            "tooltip": "Run",
+            "alignment": "left",
+            "command": "extension.executeFile",
+            "priority": 3.5
+        }
+    ],
+    "MicroPython.syncButton": [
+        {
+            "text": "$(sync)",
+            "tooltip": "sync",
+            "alignment": "left",
+            "command": "extension.execute",
+            "priority": 4
+        }
+    ],
+    "python.autoComplete.extraPaths": [
+        "/home/paul/.vscode/extensions/rt-thread.rt-thread-micropython-1.0.8/microExamples/code-completion"
+    ],
+    "python.linting.pylintArgs": [
+        "--init-hook",
+        "import sys; sys.path.append('/home/paul/.vscode/extensions/rt-thread.rt-thread-micropython-1.0.8/microExamples/code-completion')"
+    ]
+}

README.md

@@ -19,11 +19,13 @@ YouTube video for OctoPi setup here: https://www.youtube.com/watch?v=J5VzI4AFav4
   * Continue until you have added all the printers you want to use
   * haproxy entries are updated so you can connect via http://octopi.local/instancename/ (trailing slash is needed)
 * Ubuntu/Mint/Fedora (Fedora not completely tested)
+  * __You do not need to install OctoPrint using any Wiki instructions. The script will do it for you__
   * Install Ubuntu 18-22.X, Mint 20.3+, Debian, or Fedora35+ on your system (make sure your user is admin for sudo)
   * Install git if it isn't already: `sudo apt install git` or `sudo dnf install git`
   * run the command `git clone https://github.com/paukstelis/octoprint_deploy.git`
   * run the command `sudo octoprint_deploy/octoprint_deploy.sh`
-  * Choose `Prepare System` from the menu. Select your distribution type. This will install necessary packages, install octoprint, and start a template instance
+  * Choose `Prepare System` from the menu. Select your distribution type. This will install necessary packages, install OctoPrint, and start a template instance
+  * You will be asked which streamer you would like to install (mjpg-streamer or ustreamer).
   * This converts your installation into an 'OctoBuntu'-style installation. Use `OctoBuntu` for all identifiers after this point.
   * Setup admin user by connecting to your system (either http://localhost:5000 or http://[hostname]:5000 via browser
   * Continue with octoprint_deploy script and setup all your instances.
@@ -31,6 +33,9 @@ YouTube video for OctoPi setup here: https://www.youtube.com/watch?v=J5VzI4AFav4
   * Remove instances
   * Add USB webcams AFTER you've created the instance
   * Test USB connections
+  * Want to get rid of everything? `sudo octoprint_deploy/octoprint_deploy.sh remove`
 # Recent Changes
 * Add duplicate serial number detection.
 * Add architecture check to minimize errors where a system gets prepared as OctoPi when someone is using Ubuntu/Fedora/etc.
+* Include ustreamer as an option for camera streaming
+* Add remove command-line argument to get rid of all the stuff the script has done.

octoprint_deploy.sh

@@ -511,6 +511,7 @@ deb_packages() {
     -e libevent-dev \
     -e libjpeg-dev \
     -e libbsd-dev \
+    -e ffmpeg \
     | xargs apt-get install -y | log
     
     #pacakges to REMOVE go here