Upgrade to burt_network: 2.1.0 (#190)

Co-authored-by: Levi Lesches <[email protected]>
BinghamtonRover · Nov 28, 2024 · 906dab3 · 906dab3
1 parent bd8dc5f
commit 906dab3
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 22 deletions.
diff --git a/lib/src/data/metrics/arm.dart b/lib/src/data/metrics/arm.dart
@@ -14,7 +14,7 @@ class ArmMetrics extends Metrics<ArmData> {
 		MetricLine("  Limit? ${motor.isLimitSwitchPressed.displayName}", severity: motor.isLimitSwitchPressed.toBool() ? Severity.warning : null),
 		MetricLine("  Direction: ${motor.direction.humanName}"),
 		MetricLine("  Steps: ${motor.currentStep} --> ${motor.targetStep}"),
-		MetricLine("  Angle: ${motor.angle.toDegrees()} degrees"),
+		MetricLine("  Angle: ${motor.currentAngle.toDegrees()} degrees"),
 	];
 
 	@override

diff --git a/lib/src/data/metrics/gripper.dart b/lib/src/data/metrics/gripper.dart
@@ -14,7 +14,7 @@ class GripperMetrics extends Metrics<GripperData> {
 		MetricLine("  Limit? ${motor.isLimitSwitchPressed.displayName}", severity: motor.isLimitSwitchPressed.toBool() ? Severity.warning : null),
 		MetricLine("  Direction: ${motor.direction.humanName}"),
 		MetricLine("  Steps: ${motor.currentStep} --> ${motor.targetStep}"),
-		MetricLine("  Angle: ${motor.angle.toDegrees() % 360} degrees"),
+		MetricLine("  Angle: ${motor.currentAngle.toDegrees() % 360} degrees"),
 	];
 
 	@override

diff --git a/lib/src/data/protobuf.dart b/lib/src/data/protobuf.dart
@@ -1,6 +1,5 @@
 import "dart:math";
 
-import "package:protobuf/protobuf.dart";
 import "package:rover_dashboard/data.dart";
 
 export "package:protobuf/protobuf.dart" show GeneratedMessageGenericExtensions;
@@ -28,16 +27,6 @@ String getDataName(Device device) => switch (device) {
 	_ => "Unknown",
 };
 
-/// Utilities for a list of Protobuf enums.
-extension UndefinedFilter<T extends ProtobufEnum> on List<T> {
-  /// Filters out `_UNDEFINED` values from the list.
-  List<T> get filtered => [
-    for (final value in this)
-      if (value.value != 0)
-        value,
-  ];
-}
-
 /// Utilities for [Timestamp]s.
 extension TimestampUtils on Timestamp {
 	/// The [Timestamp] version of [DateTime.now].
@@ -145,6 +134,8 @@ extension DeviceUtils on Device {
 			case Device.GRIPPER: return "Gripper";
 			case Device.SCIENCE: return "Science";
 			case Device.DRIVE: return "Drive";
+			case Device.BASE_STATION: return "Base Station";
+			case Device.ANTENNA: return "Antenna";
 		}
 		// Do not use default or else you'll lose exhaustiveness checking.
 		throw ArgumentError("Unrecognized device: $this");

diff --git a/lib/src/models/view/arm.dart b/lib/src/models/view/arm.dart
@@ -50,9 +50,9 @@ class ArmModel with ChangeNotifier {
 
   /// The angles of the arm.
   ArmAngles get angles => (
-        shoulder: arm.shoulder.angle,
-        elbow: arm.elbow.angle,
-        lift: gripper.lift.angle,
+        shoulder: arm.shoulder.currentAngle,
+        elbow: arm.elbow.currentAngle,
+        lift: gripper.lift.currentAngle,
       );
 
   /// The position of the mouse, if it's in the box.

diff --git a/lib/src/pages/arm.dart b/lib/src/pages/arm.dart
@@ -304,7 +304,7 @@ class ArmPage extends ReactiveWidget<ArmModel> {
           elevation: 16,
           color: context.colorScheme.surfaceContainerHighest,
           child: CustomPaint(
-            painter: ArmPainterTop(swivelAngle: model.arm.base.angle),
+            painter: ArmPainterTop(swivelAngle: model.arm.base.currentAngle),
           ),
         ),
       ),

diff --git a/pubspec.lock b/pubspec.lock
@@ -45,11 +45,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: HEAD
-      resolved-ref: ceeb9602a332d612bd9392d2b865403eea76b465
+      ref: "2.1.0"
+      resolved-ref: "61c1952afe2210099ccde59220356db647dc79ae"
       url: "https://github.com/BinghamtonRover/Networking.git"
     source: git
-    version: "2.0.0"
+    version: "2.1.0"
   characters:
     dependency: transitive
     description:
@@ -205,7 +205,7 @@ packages:
     description:
       path: "."
       ref: set-children-public
-      resolved-ref: ee68851d5db330a47451dccff601ba4d0feb4896
+      resolved-ref: cf2f237653a48389a99081dbb5086c1acce03f7f
       url: "https://github.com/Levi-Lesches/flutter_resizable_container"
     source: git
     version: "3.0.0"

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -11,7 +11,9 @@ dependencies:
   flutter:
     sdk: flutter
   burt_network:
-    git: https://github.com/BinghamtonRover/Networking.git
+    git:
+      url: https://github.com/BinghamtonRover/Networking.git
+      ref: 2.1.0
   file_picker: ^8.0.0+1
   fl_chart: ^0.69.0
   flutter_libserialport: ^0.4.0