merge thingy

Author: Matthew-Dobson

gcs/electron/fla.ts

@@ -28,6 +28,7 @@ import type {
   LogType,
   MessageObject,
   Messages,
+  ParamObject,
   ParseResult,
   RecentLog,
 } from "./types/flaTypes"
@@ -45,7 +46,7 @@ import {
 } from "./utils/flaUtils"
 
 const UPDATE_THROTTLE_MS = 100 // Update every 100ms
-const recentLogsManager = createRecentLogsManager()
+const recentLogsManager = createRecentLogsManager(20)
 let logData: Messages | null = null
 let defaultMessageFilters: Record<string, unknown> = {}
 
@@ -128,6 +129,7 @@ async function parseDataflashLogFile(
         // File data
       } else if (messageName === "MSG") {
         // MSG data
+        // TODO: Use "VER" message for this data
         const text = splitLineData[2]?.trim()
 
         if (aircraftType === null && text) {
@@ -138,43 +140,39 @@ async function parseDataflashLogFile(
             aircraftType = "copter"
           }
         }
-      } else {
-        // Message data
-        const formatMessage = formatMessages[messageName]
-        if (formatMessage) {
-          if (!messages[messageName]) {
-            messages[messageName] = []
-          }
+      }
 
-          const messageObj: MessageObject = {
-            name: messageName,
-          }
+      // Message data
+      const formatMessage = formatMessages[messageName]
+      if (formatMessage) {
+        if (!messages[messageName]) {
+          messages[messageName] = []
+        }
 
-          const fields = formatMessage.fields
-          const format = formatMessage.format
-          const fieldsLength = fields.length
-
-          for (
-            let i = 0;
-            i < fieldsLength && i < splitLineData.length - 1;
-            i++
-          ) {
-            const field = fields[i]
-            const formatType = format[i]
-            const value = splitLineData[i + 1]?.trim()
-
-            if (value !== undefined && value !== "") {
-              if (stringTypes.has(formatType)) {
-                messageObj[field] = value
-              } else {
-                const numValue = parseFloat(value)
-                messageObj[field] = isNaN(numValue) ? 0 : numValue
-              }
+        const messageObj: MessageObject = {
+          name: messageName,
+        }
+
+        const fields = formatMessage.fields
+        const format = formatMessage.format
+        const fieldsLength = fields.length
+
+        for (let i = 0; i < fieldsLength && i < splitLineData.length - 1; i++) {
+          const field = fields[i]
+          const formatType = format[i]
+          const value = splitLineData[i + 1]?.trim()
+
+          if (value !== undefined && value !== "") {
+            if (stringTypes.has(formatType)) {
+              messageObj[field] = value
+            } else {
+              const numValue = parseFloat(value)
+              messageObj[field] = isNaN(numValue) ? 0 : numValue
             }
           }
-
-          ;(messages[messageName] as MessageObject[]).push(messageObj)
         }
+
+        ;(messages[messageName] as MessageObject[]).push(messageObj)
       }
 
       const now = Date.now()
@@ -375,6 +373,17 @@ function parseDataflashBinFile(
       aircraftType: getAircraftTypeFromMavType(parser.getMavType()),
       ...transformedMessages,
     }
+
+    if (
+      Array.isArray(parsedData?.PARM) &&
+      parsedData.PARM.some(
+        (param: MessageObject) =>
+          param.Name === "Q_ENABLE" && param.Value === 1,
+      )
+    ) {
+      parsedData.aircraftType = "quadplane"
+    }
+
     webContents.send("fla:log-parse-progress", {
       percent: 100,
     })
@@ -424,11 +433,6 @@ export function getRecentFiles(): RecentLog[] {
   return recentLogsManager.getRecentLogs()
 }
 
-// New function to clear recent files
-export function clearRecentFiles(): void {
-  recentLogsManager.clearRecentLogs()
-}
-
 async function getFirstLine(pathToFile: string): Promise<string> {
   // https://stackoverflow.com/a/60193465/23139916
   const readable = fs.createReadStream(pathToFile)
@@ -684,8 +688,12 @@ export async function getMessages(
 
     for (let j = 0; j < len; j++) {
       const point = series[j]
+      // Use UtcTimeUS if available, otherwise fall back to TimeUS
+      const timeValue =
+        point.UtcTimeUS !== undefined ? point.UtcTimeUS : point.TimeUS
+
       // making sure all the entries are numbers
-      x[j] = typeof point.TimeUS === "number" ? point.TimeUS : 0
+      x[j] = typeof timeValue === "number" ? timeValue : 0
       y[j] = typeof point[fieldName] === "number" ? point[fieldName] : 0
     }
 
@@ -699,3 +707,56 @@ export async function getMessages(
 
   return datasets
 }
+
+export async function getMessageDataForTable(
+  _event: unknown,
+  requestedMessage: string,
+): Promise<MessageObject[] | { success: false; error: string }> {
+  if (!logData) {
+    console.error("getMessageDataForTable: logData is null or undefined.")
+    return { success: false, error: "Log data not loaded." }
+  }
+
+  if (!requestedMessage.trim()) {
+    return { success: false, error: "Invalid message type." }
+  }
+
+  const series = logData[requestedMessage] as MessageObject[]
+  if (!Array.isArray(series) || series.length === 0) {
+    return { success: false, error: "No data available for this message type." }
+  }
+
+  return series
+}
+
+export async function saveParamsToFile(
+  _event: unknown,
+  filePath: string,
+  params: Array<ParamObject>,
+): Promise<{ success: boolean; message: string }> {
+  try {
+    // Sort params alphabetically by name
+    const sortedParams = [...params].sort((a, b) =>
+      a.name.localeCompare(b.name),
+    )
+
+    // Write params to file in the format: PARAM_NAME,value
+    const content = sortedParams
+      .map((param) => `${param.name.toUpperCase()},${param.value}`)
+      .join("\n")
+
+    await fs.promises.writeFile(filePath, content + "\n", "utf-8")
+
+    console.log(`Parameters saved to ${filePath}`)
+    return {
+      success: true,
+      message: `Parameters saved successfully to ${filePath}`,
+    }
+  } catch (error) {
+    console.error("Failed to save params to file:", error)
+    return {
+      success: false,
+      message: `Failed to save parameters: ${error instanceof Error ? error.message : String(error)}`,
+    }
+  }
+}

gcs/electron/main.ts

@@ -16,7 +16,12 @@ import fs from "node:fs"
 import path from "node:path"
 import packageInfo from "../package.json"
 
-import openFile, { clearRecentFiles, getMessages, getRecentFiles } from "./fla"
+import openFile, {
+  getMessageDataForTable,
+  getMessages,
+  getRecentFiles,
+  saveParamsToFile,
+} from "./fla"
 import registerAboutIPC, {
   destroyAboutWindow,
   openAboutPopout,
@@ -28,6 +33,9 @@ import registerFFmpegBinaryIPC from "./modules/ffmpegBinary"
 import registerFlaParamsIPC, {
   destroyFlaParamsWindow,
 } from "./modules/flaParamsWindow"
+import registerGraphWindowIPC, {
+  destroyAllGraphWindows,
+} from "./modules/graphWindow"
 import registerLinkStatsIPC, {
   destroyLinkStatsWindow,
   openLinkStatsWindow,
@@ -40,9 +48,6 @@ import registerVibeStatusIPC, {
 } from "./modules/vibeStatusWindow"
 import registerVideoIPC, { destroyVideoWindow } from "./modules/videoWindow"
 import { readParamsFile } from "./utils/paramsFile"
-import registerGraphWindowIPC, {
-  destroyAllGraphWindows,
-} from "./modules/graphWindow"
 
 // Check if required data files exist
 function checkRequiredDataFiles(): {
@@ -606,12 +611,16 @@ app.whenReady().then(() => {
       return []
     }
   })
-  // Clear recent logs
-  ipcMain.handle("fla:clear-recent-logs", clearRecentFiles)
 
   // Load Messages on demand
   ipcMain.handle("fla:get-messages", getMessages)
 
+  // Get message data for table
+  ipcMain.handle("fla:get-message-data-for-table", getMessageDataForTable)
+
+  // Save FLA params to file
+  ipcMain.handle("fla:save-params-to-file", saveParamsToFile)
+
   // Open native save dialog
   ipcMain.handle("app:get-save-file-path", async (event, options) => {
     const window = BrowserWindow.fromWebContents(event.sender)

gcs/electron/modules/aboutWindow.ts

@@ -1,13 +1,14 @@
 import { BrowserWindow, ipcMain, shell } from "electron"
 import path from "path"
+import { getCenteredWindowPosition } from "../utils/windowUtils"
 
 let aboutPopoutWin: BrowserWindow | null = null
 
 const VITE_DEV_SERVER_URL = process.env["VITE_DEV_SERVER_URL"]
 
-export function openAboutPopout() {
+export function openAboutPopout(parentWindow?: BrowserWindow) {
   if (aboutPopoutWin === null) {
-    aboutPopoutWin = new BrowserWindow({
+    const windowOptions: Electron.BrowserWindowConstructorOptions = {
       width: 400,
       height: 300,
       frame: true,
@@ -20,7 +21,20 @@ export function openAboutPopout() {
       },
       fullscreen: false,
       fullscreenable: false,
-    })
+    }
+
+    // Position window in the center of the parent window
+    const centeredPosition = getCenteredWindowPosition(
+      parentWindow,
+      windowOptions.width!,
+      windowOptions.height!,
+    )
+    if (centeredPosition) {
+      windowOptions.x = centeredPosition.x
+      windowOptions.y = centeredPosition.y
+    }
+
+    aboutPopoutWin = new BrowserWindow(windowOptions)
   }
 
   if (VITE_DEV_SERVER_URL) {
@@ -57,8 +71,9 @@ export default function registerAboutIPC() {
   ipcMain.removeHandler("app:open-about-window")
   ipcMain.removeHandler("app:close-about-window")
 
-  ipcMain.handle("app:open-about-window", () => {
-    openAboutPopout()
+  ipcMain.handle("app:open-about-window", (event) => {
+    const parentWindow = BrowserWindow.fromWebContents(event.sender)
+    openAboutPopout(parentWindow || undefined)
   })
   ipcMain.handle("app:close-about-window", () => closeAboutPopout())
 }

gcs/electron/modules/ekfStatusWindow.ts

@@ -1,13 +1,14 @@
 import { BrowserWindow, ipcMain } from "electron"
 import path from "path"
+import { getCenteredWindowPosition } from "../utils/windowUtils"
 
 const VITE_DEV_SERVER_URL = process.env["VITE_DEV_SERVER_URL"]
 
 let ekfStatusWin: BrowserWindow | null = null
 
-export function openEkfStatusWindow() {
+export function openEkfStatusWindow(parentWindow?: BrowserWindow) {
   if (ekfStatusWin === null) {
-    ekfStatusWin = new BrowserWindow({
+    const windowOptions: Electron.BrowserWindowConstructorOptions = {
       width: 700,
       height: 400,
       frame: true,
@@ -21,7 +22,20 @@ export function openEkfStatusWindow() {
       fullscreen: false,
       fullscreenable: false,
       alwaysOnTop: true,
-    })
+    }
+
+    // Position window in the center of the parent window
+    const centeredPosition = getCenteredWindowPosition(
+      parentWindow,
+      windowOptions.width!,
+      windowOptions.height!,
+    )
+    if (centeredPosition) {
+      windowOptions.x = centeredPosition.x
+      windowOptions.y = centeredPosition.y
+    }
+
+    ekfStatusWin = new BrowserWindow(windowOptions)
   }
 
   if (VITE_DEV_SERVER_URL) {
@@ -51,8 +65,9 @@ export default function registerEkfStatusIPC() {
   ipcMain.removeHandler("app:close-ekf-status-window")
   ipcMain.removeHandler("app:update-ekf-status")
 
-  ipcMain.handle("app:open-ekf-status-window", () => {
-    openEkfStatusWindow()
+  ipcMain.handle("app:open-ekf-status-window", (event) => {
+    const parentWindow = BrowserWindow.fromWebContents(event.sender)
+    openEkfStatusWindow(parentWindow || undefined)
   })
   ipcMain.handle("app:close-ekf-status-window", () => closeEkfStatusWindow())
   ipcMain.handle("app:update-ekf-status", (_, ekfStatusData) => {