diff --git a/launch/basestation.launch b/launch/basestation.launch index 47f7dd691..10679cc71 100644 --- a/launch/basestation.launch +++ b/launch/basestation.launch @@ -14,7 +14,8 @@ - + + diff --git a/src/teleoperation/frontend/src/components/AutonTask.vue b/src/teleoperation/frontend/src/components/AutonTask.vue index bf06605f8..f0da85182 100644 --- a/src/teleoperation/frontend/src/components/AutonTask.vue +++ b/src/teleoperation/frontend/src/components/AutonTask.vue @@ -47,7 +47,7 @@
- +
diff --git a/src/teleoperation/frontend/src/components/CameraFeed.vue b/src/teleoperation/frontend/src/components/CameraFeed.vue index 8b96eefb8..d29247716 100644 --- a/src/teleoperation/frontend/src/components/CameraFeed.vue +++ b/src/teleoperation/frontend/src/components/CameraFeed.vue @@ -3,20 +3,7 @@

{{ name }} • ID: {{ id }}

-
- - -
- +
@@ -52,8 +39,6 @@ export default defineComponent({ // IK Mode IKCam: false, - - quality: 2 } }, @@ -74,15 +59,7 @@ export default defineComponent({ this.sendMessage({type: 'start_click_ik', data: {x: event.offsetX, y: event.offsetY}}) } }, - changeQuality: function () { - this.sendMessage({ - type: 'sendCameras', - primary: this.mission === 'sa', - device: this.id, - resolution: parseInt(this.quality) - }) - }, - + toggleIKMode: function () { this.IKCam = !this.IKCam }, diff --git a/src/teleoperation/frontend/src/components/Cameras.vue b/src/teleoperation/frontend/src/components/Cameras.vue index 786f7b60b..55f8be2cd 100644 --- a/src/teleoperation/frontend/src/components/Cameras.vue +++ b/src/teleoperation/frontend/src/components/Cameras.vue @@ -1,7 +1,6 @@ @@ -62,10 +61,6 @@ export default { }, props: { - primary: { - type: Boolean, - required: true - }, isSA: { type: Boolean, required: true @@ -82,10 +77,7 @@ export default { cameraIdx: 0, cameraName: '', capacity: 4, - qualities: reactive(new Array(9).fill(-1)), streamOrder: reactive([]), - - num_available: -1 } }, @@ -123,19 +115,9 @@ export default { setCamIndex: function (index: number) { // every time a button is pressed, it changes cam status and adds/removes from stream this.camsEnabled[index] = !this.camsEnabled[index] - if (this.camsEnabled[index]) this.qualities[index] = 2 //if enabling camera, turn on medium quality this.changeStream(index) }, - sendCameras: function (index: number) { - this.sendMessage({ - type: 'sendCameras', - primary: this.primary, - device: index, - resolution: this.qualities[index] - }) - }, - addCameraName: function () { this.names[this.cameraIdx] = this.cameraName }, @@ -145,9 +127,7 @@ export default { if (found) { this.streamOrder.splice(this.streamOrder.indexOf(index), 1) this.streamOrder.push(-1) - this.qualities[index] = -1 //close the stream when sending it to comms } else this.streamOrder[this.streamOrder.indexOf(-1)] = index - this.sendCameras(index) }, takePanorama() { diff --git a/src/teleoperation/frontend/src/components/DMESTask.vue b/src/teleoperation/frontend/src/components/DMESTask.vue index f33cd09aa..9db855615 100644 --- a/src/teleoperation/frontend/src/components/DMESTask.vue +++ b/src/teleoperation/frontend/src/components/DMESTask.vue @@ -22,7 +22,7 @@
- +
diff --git a/src/teleoperation/frontend/src/components/ISHTask.vue b/src/teleoperation/frontend/src/components/ISHTask.vue index 8be0a6a1c..08e46c76a 100644 --- a/src/teleoperation/frontend/src/components/ISHTask.vue +++ b/src/teleoperation/frontend/src/components/ISHTask.vue @@ -25,7 +25,7 @@
- +
diff --git a/src/teleoperation/frontend/src/components/Menu.vue b/src/teleoperation/frontend/src/components/Menu.vue index cfea3f72e..cea3a9804 100644 --- a/src/teleoperation/frontend/src/components/Menu.vue +++ b/src/teleoperation/frontend/src/components/Menu.vue @@ -13,8 +13,7 @@ - - +
diff --git a/src/teleoperation/frontend/src/components/MenuButton.vue b/src/teleoperation/frontend/src/components/MenuButton.vue index 6218a81f8..5b0c47f68 100644 --- a/src/teleoperation/frontend/src/components/MenuButton.vue +++ b/src/teleoperation/frontend/src/components/MenuButton.vue @@ -16,7 +16,7 @@ export default defineComponent({ type: String, required: true } - } + }, }) diff --git a/src/teleoperation/frontend/src/components/SATask.vue b/src/teleoperation/frontend/src/components/SATask.vue index 4382b7c56..f381f72d4 100644 --- a/src/teleoperation/frontend/src/components/SATask.vue +++ b/src/teleoperation/frontend/src/components/SATask.vue @@ -28,7 +28,7 @@
- +
diff --git a/src/teleoperation/frontend/src/router/index.ts b/src/teleoperation/frontend/src/router/index.ts index c8681c3d0..9d4faac4b 100644 --- a/src/teleoperation/frontend/src/router/index.ts +++ b/src/teleoperation/frontend/src/router/index.ts @@ -4,6 +4,7 @@ import DMESTask from '../components/DMESTask.vue' import AutonTask from '../components/AutonTask.vue' import ISHTask from '../components/ISHTask.vue' import SATask from '../components/SATask.vue' +import Cameras from '../components/Cameras.vue' import Rover3D from '../components/Rover3D.vue' const routes = [ @@ -43,12 +44,20 @@ const routes = [ name: 'ISHTask', component: ISHTask }, + { + path: '/Cameras', + name: 'Cameras', + component: Cameras, + props: { + isSA: false, + mission: 'other' + } + }, { path: "/Control", name: "Control", component: Rover3D, }, - ] const router = createRouter({ history: createWebHistory(), diff --git a/src/teleoperation/gui_chromium.sh b/src/teleoperation/gui_chromium.sh index 3f5e50061..e83d1c054 100755 --- a/src/teleoperation/gui_chromium.sh +++ b/src/teleoperation/gui_chromium.sh @@ -4,4 +4,6 @@ # Chromium currently only supports this when using VA-API hardware acceleration # It uses the WebCodecs API to decode # You can easily test if your setup works with this URL: https://w3c.github.io/webcodecs/samples/video-decode-display/ -chromium --enable-features=VaapiVideoDecodeLinuxGL --app=http://localhost:8080 +readonly FLAGS="--enable-features=VaapiVideoDecodeLinuxGL" +readonly ADDRESS="http://localhost:8080" +chromium ${FLAGS} --app=${ADDRESS}/$1 diff --git a/src/teleoperation/gui_chromium_cameras.sh b/src/teleoperation/gui_chromium_cameras.sh new file mode 100755 index 000000000..ef6bade5b --- /dev/null +++ b/src/teleoperation/gui_chromium_cameras.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +$(dirname $0)/gui_chromium.sh Cameras diff --git a/src/teleoperation/gui_chromium_menu.sh b/src/teleoperation/gui_chromium_menu.sh new file mode 100755 index 000000000..a259fcd1c --- /dev/null +++ b/src/teleoperation/gui_chromium_menu.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +$(dirname $0)/gui_chromium.sh