From 3b98beab6f0f84b226168046c8c0d93a91141a88 Mon Sep 17 00:00:00 2001 From: Kwashie A <104215256+Kwash67@users.noreply.github.com> Date: Wed, 26 Mar 2025 18:37:18 +0000 Subject: [PATCH 1/7] fixed issue with Battery preset --- gcs/src/components/fla/presetCategories.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcs/src/components/fla/presetCategories.js b/gcs/src/components/fla/presetCategories.js index f37f7b56c..a2af3e5d4 100644 --- a/gcs/src/components/fla/presetCategories.js +++ b/gcs/src/components/fla/presetCategories.js @@ -59,7 +59,7 @@ const dataflashPresetCategories = [ filters: [ { name: "Battery Voltage vs Current", - filters: { BATT: ["Volt", "Curr"] }, + filters: { BAT: ["Volt", "Curr"] }, aircraftType: ["copter", "plane", "quadplane"], }, ], From a7e3746f33d68a12fc620fc2e953fe617e4325b6 Mon Sep 17 00:00:00 2001 From: Kwashie A <104215256+Kwash67@users.noreply.github.com> Date: Wed, 26 Mar 2025 18:59:16 +0000 Subject: [PATCH 2/7] missions route was missing for some reason --- gcs/src/components/mainContent.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gcs/src/components/mainContent.jsx b/gcs/src/components/mainContent.jsx index 6aac22d7a..30a4d510f 100644 --- a/gcs/src/components/mainContent.jsx +++ b/gcs/src/components/mainContent.jsx @@ -11,6 +11,7 @@ import { SettingsProvider } from "../helpers/settingsProvider" // Routes import FLA from "../fla" import Graphs from "../graphs" +import Missions from "../missions" import Params from "../params" import Config from "../config" import CameraWindow from "./dashboard/webcam/webcam" @@ -34,6 +35,7 @@ export default function AppContent() { } /> + } /> } /> } /> } /> From 84bbc082d585fadfdb5f8ebda5132121ebe9f992 Mon Sep 17 00:00:00 2001 From: Kwashie A <104215256+Kwash67@users.noreply.github.com> Date: Wed, 26 Mar 2025 19:00:14 +0000 Subject: [PATCH 3/7] removed annoying run command message when you switch tabs with spotlight --- gcs/src/components/spotlight/commandHandler.js | 1 - 1 file changed, 1 deletion(-) diff --git a/gcs/src/components/spotlight/commandHandler.js b/gcs/src/components/spotlight/commandHandler.js index 2291b2522..ffd86409d 100644 --- a/gcs/src/components/spotlight/commandHandler.js +++ b/gcs/src/components/spotlight/commandHandler.js @@ -83,7 +83,6 @@ export function AddCommand(id, command, shortcut = null, macShortcut = null) { export function RunCommand(id) { // Search for a command by id - console.log(`Running command, ${id}`) try { commands.find((entry) => entry.id == id).command() } catch { From 2b742895e9d7a09d207500fb545f2efbc34d6a09 Mon Sep 17 00:00:00 2001 From: Kwashie A <104215256+Kwash67@users.noreply.github.com> Date: Wed, 26 Mar 2025 19:48:02 +0000 Subject: [PATCH 4/7] allow center map on mission --- .../components/dashboard/floatingToolbar.jsx | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gcs/src/components/dashboard/floatingToolbar.jsx b/gcs/src/components/dashboard/floatingToolbar.jsx index c0ae587e9..c2478c3b9 100644 --- a/gcs/src/components/dashboard/floatingToolbar.jsx +++ b/gcs/src/components/dashboard/floatingToolbar.jsx @@ -5,6 +5,7 @@ // 3rd Party Imports import { ActionIcon, Tooltip } from "@mantine/core" import { useLocalStorage } from "@mantine/hooks" +import { centerOfMass, polygon } from "@turf/turf" import { IconAnchor, IconAnchorOff, @@ -12,6 +13,7 @@ import { IconMapPins, IconSun, IconSunOff, + IconHome, } from "@tabler/icons-react" // Helper Functions @@ -58,6 +60,24 @@ export default function FloatingToolbar({ setFollowDrone(false) } + function centerMapOnMission() { + if (filteredMissionItems.length > 0) { + let points = filteredMissionItems.map((item) => [ + item.x * 1e-7, + item.y * 1e-7, + ]) + points.push(points[0]) // Close the polygon + let geo = polygon([points]) + let center = centerOfMass(geo).geometry.coordinates + let lat = parseFloat(center[0]) + let lon = parseFloat(center[1]) + mapRef.current.getMap().flyTo({ + center: [lon, lat], + }) + } + setFollowDrone(false) + } + return (
- {/* Center Map on first mission item */} + {/* Center Map on mission */} 0 ? "No mission" : "Center on mission" @@ -103,7 +123,7 @@ export default function FloatingToolbar({ > From 0c2f21d8c6d5e802df57aa6fd9e556a3e764a922 Mon Sep 17 00:00:00 2001 From: Kwashie A <104215256+Kwash67@users.noreply.github.com> Date: Wed, 26 Mar 2025 19:49:08 +0000 Subject: [PATCH 5/7] removed unused import --- gcs/src/components/dashboard/floatingToolbar.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gcs/src/components/dashboard/floatingToolbar.jsx b/gcs/src/components/dashboard/floatingToolbar.jsx index c2478c3b9..2b7fbbb81 100644 --- a/gcs/src/components/dashboard/floatingToolbar.jsx +++ b/gcs/src/components/dashboard/floatingToolbar.jsx @@ -13,7 +13,6 @@ import { IconMapPins, IconSun, IconSunOff, - IconHome, } from "@tabler/icons-react" // Helper Functions @@ -115,7 +114,7 @@ export default function FloatingToolbar({ - {/* Center Map on mission */} + {/* Center Map on full mission */} 0 ? "No mission" : "Center on mission" From 402512989e944798bd87e531baeab89bdef8030c Mon Sep 17 00:00:00 2001 From: Kwashie A <104215256+Kwash67@users.noreply.github.com> Date: Wed, 26 Mar 2025 19:52:45 +0000 Subject: [PATCH 6/7] commented out unused function --- .../components/dashboard/floatingToolbar.jsx | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gcs/src/components/dashboard/floatingToolbar.jsx b/gcs/src/components/dashboard/floatingToolbar.jsx index 2b7fbbb81..04dd8680b 100644 --- a/gcs/src/components/dashboard/floatingToolbar.jsx +++ b/gcs/src/components/dashboard/floatingToolbar.jsx @@ -48,16 +48,16 @@ export default function FloatingToolbar({ ) } - function centerMapOnFirstMissionItem() { - if (filteredMissionItems.length > 0) { - let lat = parseFloat(filteredMissionItems[0].x * 1e-7) - let lon = parseFloat(filteredMissionItems[0].y * 1e-7) - mapRef.current.getMap().flyTo({ - center: [lon, lat], - }) - } - setFollowDrone(false) - } + // function centerMapOnFirstMissionItem() { + // if (filteredMissionItems.length > 0) { + // let lat = parseFloat(filteredMissionItems[0].x * 1e-7) + // let lon = parseFloat(filteredMissionItems[0].y * 1e-7) + // mapRef.current.getMap().flyTo({ + // center: [lon, lat], + // }) + // } + // setFollowDrone(false) + // } function centerMapOnMission() { if (filteredMissionItems.length > 0) { From ee8dabd80fe762d0e8205238779fe00c565c0956 Mon Sep 17 00:00:00 2001 From: Julian Jones Date: Fri, 28 Mar 2025 12:16:09 +0000 Subject: [PATCH 7/7] removed comments --- gcs/src/components/dashboard/floatingToolbar.jsx | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gcs/src/components/dashboard/floatingToolbar.jsx b/gcs/src/components/dashboard/floatingToolbar.jsx index 04dd8680b..6bc815a07 100644 --- a/gcs/src/components/dashboard/floatingToolbar.jsx +++ b/gcs/src/components/dashboard/floatingToolbar.jsx @@ -48,17 +48,6 @@ export default function FloatingToolbar({ ) } - // function centerMapOnFirstMissionItem() { - // if (filteredMissionItems.length > 0) { - // let lat = parseFloat(filteredMissionItems[0].x * 1e-7) - // let lon = parseFloat(filteredMissionItems[0].y * 1e-7) - // mapRef.current.getMap().flyTo({ - // center: [lon, lat], - // }) - // } - // setFollowDrone(false) - // } - function centerMapOnMission() { if (filteredMissionItems.length > 0) { let points = filteredMissionItems.map((item) => [