From a5dcba42cfd2f4e412910a268d45f56197d46bc0 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Sat, 21 May 2022 10:42:04 +0200
Subject: [PATCH 1/2] fix: add u4vl-mjpeg to printfarm panel

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/panels/FarmPrinterPanel.vue | 37 ++++++++++++++--------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/components/panels/FarmPrinterPanel.vue b/src/components/panels/FarmPrinterPanel.vue
index 2ff76171a..17982b1f2 100644
--- a/src/components/panels/FarmPrinterPanel.vue
+++ b/src/components/panels/FarmPrinterPanel.vue
@@ -45,21 +45,28 @@
                 <div>
                     <v-img ref="imageDiv" :height="imageHeight" :src="printer_image" class="d-flex align-end">
                         <div
-                            v-if="printer.socket.isConnected && currentCamId !== 'off' && currentWebcam"
+                            v-if="
+                                printer.socket.isConnected &&
+                                currentCamId !== 'off' &&
+                                currentWebcam &&
+                                'service' in currentWebcam
+                            "
                             class="webcamContainer">
-                            <template v-if="'service' in currentWebcam && currentWebcam.service === 'mjpegstreamer'">
-                                <webcam-mjpegstreamer
-                                    :cam-settings="currentWebcam"
-                                    :printer-url="printerUrl"
-                                    :show-fps="false"></webcam-mjpegstreamer>
-                            </template>
-                            <template
-                                v-if="'service' in currentWebcam && currentWebcam.service === 'mjpegstreamer-adaptive'">
-                                <webcam-mjpegstreamer-adaptive
-                                    :cam-settings="currentWebcam"
-                                    :printer-url="printerUrl"
-                                    :show-fps="false"></webcam-mjpegstreamer-adaptive>
-                            </template>
+                            <webcam-mjpegstreamer
+                                v-if="currentWebcam.service === 'mjpegstreamer'"
+                                :cam-settings="currentWebcam"
+                                :printer-url="printerUrl"
+                                :show-fps="false"></webcam-mjpegstreamer>
+                            <webcam-mjpegstreamer-adaptive
+                                v-else-if="currentWebcam.service === 'mjpegstreamer-adaptive'"
+                                :cam-settings="currentWebcam"
+                                :printer-url="printerUrl"
+                                :show-fps="false"></webcam-mjpegstreamer-adaptive>
+                            <webcam-uv4l-mjpeg
+                                v-else-if="currentWebcam.service === 'uv4l-mjpeg'"
+                                :cam-settings="currentWebcam"
+                                :printer-url="printerUrl"
+                                :show-fps="false"></webcam-uv4l-mjpeg>
                         </div>
                         <v-card-title
                             class="white--text py-2"
@@ -125,6 +132,7 @@ import BaseMixin from '@/components/mixins/base'
 import { FarmPrinterState } from '@/store/farm/printer/types'
 import Mjpegstreamer from '@/components/webcams/Mjpegstreamer.vue'
 import MjpegstreamerAdaptive from '@/components/webcams/MjpegstreamerAdaptive.vue'
+import Uv4lMjpeg from '@/components/webcams/Uv4lMjpeg.vue'
 import MainsailLogo from '@/components/ui/MainsailLogo.vue'
 import Panel from '@/components/ui/Panel.vue'
 import { mdiPrinter3d, mdiWebcam, mdiMenuDown, mdiWebcamOff, mdiFileOutline } from '@mdi/js'
@@ -135,6 +143,7 @@ import { Debounce } from 'vue-debounce-decorator'
         Panel,
         'webcam-mjpegstreamer': Mjpegstreamer,
         'webcam-mjpegstreamer-adaptive': MjpegstreamerAdaptive,
+        'webcam-uv4l-mjpeg': Uv4lMjpeg,
         'mainsail-logo': MainsailLogo,
     },
 })

From 4ed387572edaf39c371e676207dafeede8c8a480 Mon Sep 17 00:00:00 2001
From: Stefan Dej <meteyou@gmail.com>
Date: Sat, 21 May 2022 10:49:24 +0200
Subject: [PATCH 2/2] fix: only display supported webcams in print farm panel

Signed-off-by: Stefan Dej <meteyou@gmail.com>
---
 src/components/panels/FarmPrinterPanel.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/panels/FarmPrinterPanel.vue b/src/components/panels/FarmPrinterPanel.vue
index 17982b1f2..5d688c975 100644
--- a/src/components/panels/FarmPrinterPanel.vue
+++ b/src/components/panels/FarmPrinterPanel.vue
@@ -26,7 +26,7 @@
                         </v-list-item-content>
                     </v-list-item>
                     <v-list-item
-                        v-for="webcam of printer_webcams"
+                        v-for="webcam of supportedPrinterWebcams"
                         :key="webcam.index"
                         link
                         @click="currentCamId = webcam.id">
@@ -137,6 +137,7 @@ import MainsailLogo from '@/components/ui/MainsailLogo.vue'
 import Panel from '@/components/ui/Panel.vue'
 import { mdiPrinter3d, mdiWebcam, mdiMenuDown, mdiWebcamOff, mdiFileOutline } from '@mdi/js'
 import { Debounce } from 'vue-debounce-decorator'
+import { GuiWebcamStateWebcam } from '@/store/gui/webcams/types'
 
 @Component({
     components: {
@@ -216,13 +217,19 @@ export default class FarmPrinterPanel extends Mixins(BaseMixin) {
     }
 
     get showWebcamSwitch() {
-        return this.printer.socket.isConnected && this.printer_webcams.length > 0
+        return this.printer.socket.isConnected && this.supportedPrinterWebcams.length > 0
     }
 
     get printer_webcams() {
         return this.$store.getters['farm/' + this.printer._namespace + '/getPrinterWebcams']
     }
 
+    get supportedPrinterWebcams() {
+        return this.printer_webcams.filter((webcam: GuiWebcamStateWebcam) =>
+            ['mjpegstreamer', 'mjpegstreamer-adaptive', 'uv4l-mjpeg'].includes(webcam.service)
+        )
+    }
+
     get currentWebcam() {
         const currentCam = this.printer_webcams.find((webcam: any) => webcam.id === this.currentCamId)
         if (currentCam) return currentCam