diff --git a/lib/src/device.dart b/lib/src/device.dart index 1b7c212a..406aa821 100644 --- a/lib/src/device.dart +++ b/lib/src/device.dart @@ -41,6 +41,9 @@ class Device { /// The interface this device has, if known. final String? interface; + /// The serial number of the device, if it has one + final String? serialNumber; + /// The index of this device, if known. final int? index; @@ -54,5 +57,6 @@ class Device { this.index, this.port, this.interface, + this.serialNumber, }); } diff --git a/lib/src/udev.dart b/lib/src/udev.dart index 1e0829c2..b2852470 100644 --- a/lib/src/udev.dart +++ b/lib/src/udev.dart @@ -40,6 +40,7 @@ extension UdevGenerator on Device { if (product != null) buffer.write('ATTRS{product}=="$product", '); if (port != null) buffer.write('KERNELS=="$port", '); if (interface != null) buffer.write('ATTRS{interface}=="$interface", '); + if (serialNumber != null) buffer.write('ATTRS{serial}=="$serialNumber", '); buffer.writeln('ENV{$varName}="t"'); // Line 2 generates the symlink for the device diff --git a/subsystems/lib/src/devices/gps.dart b/subsystems/lib/src/devices/gps.dart index 2ec8b075..85a6862c 100644 --- a/subsystems/lib/src/devices/gps.dart +++ b/subsystems/lib/src/devices/gps.dart @@ -7,7 +7,7 @@ import "package:burt_network/burt_network.dart"; import "package:subsystems/subsystems.dart"; /// The port/device file to listen to the GPS on. -const gpsPort = "/dev/rover-gps"; +const gpsPort = "/dev/rover_gps"; /// The UDP socket on the Autonomy program. final autonomySocket = SocketInfo( diff --git a/subsystems/lib/src/devices/imu.dart b/subsystems/lib/src/devices/imu.dart index 3fc69ccd..b480adce 100644 --- a/subsystems/lib/src/devices/imu.dart +++ b/subsystems/lib/src/devices/imu.dart @@ -9,7 +9,7 @@ import "package:burt_network/burt_network.dart"; import "../osc.dart"; /// The serial port that the IMU is connected to. -const imuPort = "/dev/rover-imu"; +const imuPort = "/dev/rover_imu"; /// The version that we are using for [RoverPosition] data. final positionVersion = Version(major: 1, minor: 0); diff --git a/video/lib/src/isolates/child.dart b/video/lib/src/isolates/child.dart index f355fd58..d9a9c0de 100644 --- a/video/lib/src/isolates/child.dart +++ b/video/lib/src/isolates/child.dart @@ -3,7 +3,7 @@ import "dart:convert"; import "dart:io"; import "package:burt_network/burt_network.dart"; -import "package:dartcv4/dartcv.dart"; +import "package:dartcv4/dartcv.dart" hide LogLevel; import "package:typed_isolate/typed_isolate.dart"; import "package:video/video.dart"; diff --git a/video/lib/src/isolates/opencv.dart b/video/lib/src/isolates/opencv.dart index 6a683754..06b22652 100644 --- a/video/lib/src/isolates/opencv.dart +++ b/video/lib/src/isolates/opencv.dart @@ -1,4 +1,4 @@ -import "package:dartcv4/dartcv.dart"; +import "package:dartcv4/dartcv.dart" hide LogLevel; import "package:burt_network/burt_network.dart"; import "package:video/utils.dart"; diff --git a/video/lib/src/isolates/payload.dart b/video/lib/src/isolates/payload.dart index 19276c6e..759ac978 100644 --- a/video/lib/src/isolates/payload.dart +++ b/video/lib/src/isolates/payload.dart @@ -1,7 +1,7 @@ import "dart:ffi"; import "package:burt_network/burt_network.dart"; -import "package:dartcv4/dartcv.dart"; +import "package:dartcv4/dartcv.dart" hide LogLevel; import "package:video/video.dart"; /// A payload containing some data to report back to the parent isolate. diff --git a/video/lib/src/isolates/realsense.dart b/video/lib/src/isolates/realsense.dart index 4d36a9d0..d0e85a33 100644 --- a/video/lib/src/isolates/realsense.dart +++ b/video/lib/src/isolates/realsense.dart @@ -1,7 +1,7 @@ import "dart:ffi"; import "package:burt_network/burt_network.dart"; -import "package:dartcv4/dartcv.dart"; +import "package:dartcv4/dartcv.dart" hide LogLevel; import "package:protobuf/protobuf.dart"; import "package:video/utils.dart"; diff --git a/video/lib/src/utils/constants.dart b/video/lib/src/utils/constants.dart index fe04eb26..fc7e80bd 100644 --- a/video/lib/src/utils/constants.dart +++ b/video/lib/src/utils/constants.dart @@ -11,14 +11,14 @@ import "package:video/video.dart"; /// /// Map for MAC or LINUX devices Map cameraNames = { - CameraName.ROVER_FRONT: "/dev/rover-cam_realsense_rgb", - CameraName.ROVER_REAR: "/dev/rover-cam_subsystem_3", - CameraName.AUTONOMY_DEPTH: "/dev/rover-cam_realsense_depth", - CameraName.SUBSYSTEM1: "/dev/rover-cam_subsystem_1", - CameraName.SUBSYSTEM2: "/dev/rover-cam_subsystem_2", - CameraName.SUBSYSTEM3: "/dev/rover-cam_subsystem_3", - CameraName.BOTTOM_LEFT: "/dev/rover-cam_bottom_left", - CameraName.BOTTOM_RIGHT: "/dev/rover-cam_bottom_right", + CameraName.ROVER_FRONT: "/dev/rover_cam_front", + CameraName.ROVER_REAR: "/dev/rover_cam_rear", + CameraName.AUTONOMY_DEPTH: "/dev/rover_cam_realsense_depth", + CameraName.SUBSYSTEM1: "/dev/rover_cam_subsystem_1", + CameraName.SUBSYSTEM2: "/dev/rover_cam_subsystem_2", + CameraName.SUBSYSTEM3: "/dev/rover_cam_subsystem_3", + CameraName.BOTTOM_LEFT: "/dev/rover_cam_bottom_left", + CameraName.BOTTOM_RIGHT: "/dev/rover_cam_bottom_right", }; /// Map for WINDOWS devices diff --git a/video/pubspec.yaml b/video/pubspec.yaml index 2c05a098..218657b7 100644 --- a/video/pubspec.yaml +++ b/video/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: typed_isolate: ^6.0.0 ffi: ^2.1.0 protobuf: ^3.1.0 - dartcv4: ^1.1.4 + dartcv4: ^1.1.8 dev_dependencies: ffigen: ^19.1.0