Mecademic hardware UI Integration

captain/routes/devices.py

@@ -13,4 +13,5 @@ async def get_devices():
         cameras=device_finder.get_cameras(),
         serialDevices=device_finder.get_serial_devices(),
         visaDevices=device_finder.get_visa_devices(),
+        mecademicDevices=device_finder.get_mecademic_devices(),
     )

captain/services/hardware.py

@@ -4,7 +4,7 @@
 import subprocess
 from sys import platform
 
-from captain.types.devices import CameraDevice, SerialDevice, VISADevice
+from captain.types.devices import CameraDevice, SerialDevice, VISADevice, MecademicDevice
 
 __all__ = ["get_device_finder"]
 
@@ -60,6 +60,11 @@ def get_visa_devices(self) -> list[VISADevice]:
 
         return devices
 
+    def get_mecademic_devices(self) -> list[MecademicDevice]:
+        """Returns a list of Mecademic devices connected to the system."""
+        devices = [MecademicDevice(name="Flojoy's Mecademic Meca500", ip="192.168.0.100")]
+        return devices
+
 
 class LinuxDeviceFinder(DefaultDeviceFinder):
     def get_cameras(self) -> list[CameraDevice]:

captain/types/devices.py

@@ -21,7 +21,13 @@ class VISADevice(BaseModel):
     description: str
 
 
+class MecademicDevice(BaseModel):
+    name: str
+    ip: str
+
+
 class DeviceInfo(BaseModel):
     cameras: list[CameraDevice]
     serialDevices: list[SerialDevice]
     visaDevices: list[VISADevice]
+    mecademicDevices: list[MecademicDevice]

captain/utils/manifest/build_manifest.py

@@ -52,6 +52,7 @@
     SerialDevice,
     VisaDevice,
     CameraConnection,
+    MecademicConnection,
     SerialConnection,
     VisaConnection,
 ]

src/feature/common/types/ParamValueType.ts

@@ -15,4 +15,5 @@ export type ParamValueType =
   | "CameraConnection"
   | "SerialConnection"
   | "VisaConnection"
+  | "MecademicConnection"
   | "unknown";

src/feature/device_panel/components/HardwareInfo.tsx

@@ -53,6 +53,14 @@ export const HardwareInfo = () => {
         }))
       : undefined;
 
+  const mecademicDevices: DeviceCardProps[] | undefined =
+    devices.mecademicDevices.length > 0
+      ? devices.mecademicDevices.map((d) => ({
+          name: d.name,
+          port: d.ip,
+        }))
+      : undefined;
+
   return (
     <div>
       <Button onClick={refetch}>Refresh</Button>
@@ -62,6 +70,8 @@ export const HardwareInfo = () => {
       <DeviceSection title="Serial" devices={serialDevices} />
       <div className="py-6" />
       <DeviceSection title="VISA" devices={visaDevices} />
+      <div className="py-6" />
+      <DeviceSection title="Mecademic" devices={mecademicDevices} />
     </div>
   );
 };

src/feature/flow_chart_panel/components/node-edit-menu/MecademicDeviceSelect.tsx

@@ -0,0 +1,18 @@
+import { useHardwareDevices } from "@src/hooks/useHardwareDevices";
+import { DeviceSelect, SelectProps } from "./DeviceSelect";
+
+export const MecademicDeviceSelect = (props: SelectProps) => {
+  const hardware = useHardwareDevices();
+  const mecas = hardware?.mecademicDevices;
+
+  return (
+    <DeviceSelect
+      {...props}
+      devices={mecas}
+      placeholder="No cameras found"
+      keySelector={(meca) => meca.ip.toString()}
+      valueSelector={(meca) => meca.ip.toString()}
+      nameSelector={(meca) => meca.name}
+    />
+  );
+};

src/feature/flow_chart_panel/components/node-edit-menu/ParamField.tsx

@@ -15,6 +15,8 @@ import { useHasUnsavedChanges } from "@src/hooks/useHasUnsavedChanges";
 import { CameraSelect } from "./CameraSelect";
 import { SerialDeviceSelect } from "./SerialDeviceSelect";
 import { VisaDeviceSelect } from "./VisaDeviceSelect";
+import React from "react";
+import { MecademicDeviceSelect } from "@feature/flow_chart_panel/components/node-edit-menu/MecademicDeviceSelect";
 
 type ParamFieldProps = {
   nodeId: string;
@@ -129,6 +131,8 @@ const ParamField = ({
     case "VisaDevice":
     case "VisaConnection":
       return <VisaDeviceSelect onValueChange={handleChange} value={value} />;
+      case "MecademicConnection":
+        return <MecademicDeviceSelect onValueChange={handleChange} value={value} />;
     case "str":
     case "list[int]":
     case "list[float]":

src/hooks/useHardwareDevices.ts

@@ -25,12 +25,18 @@ const VISADevice = z.object({
   description: z.string(),
 });
 
+const MecademicDevice = z.object({
+  ip: z.string(),
+  name: z.string(),
+});
+
 type VISADevice = z.infer<typeof VISADevice>;
 
 const DeviceInfo = z.object({
   cameras: z.array(CameraDevice),
   serialDevices: z.array(SerialDevice),
   visaDevices: z.array(VISADevice),
+  mecademicDevices: z.array(MecademicDevice),
 });
 
 type DeviceInfo = z.infer<typeof DeviceInfo>;