Upgraded Protobuf and regenerated

BinghamtonRover · May 21, 2024 · 53109c8 · 53109c8
1 parent 96b1883
commit 53109c8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/Protobuf b/Protobuf
diff --git a/lib/src/generated/arm.pb.dart b/lib/src/generated/arm.pb.dart
@@ -99,8 +99,8 @@ class Coordinates extends $pb.GeneratedMessage {
 
 class MotorData extends $pb.GeneratedMessage {
   factory MotorData({
-    $core.bool? isMoving,
-    $core.bool? isLimitSwitchPressed,
+    $1.BoolState? isMoving,
+    $1.BoolState? isLimitSwitchPressed,
     MotorDirection? direction,
     $core.int? currentStep,
     $core.int? targetStep,
@@ -132,8 +132,8 @@ class MotorData extends $pb.GeneratedMessage {
   factory MotorData.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MotorData', createEmptyInstance: create)
-    ..aOB(1, _omitFieldNames ? '' : 'isMoving')
-    ..aOB(2, _omitFieldNames ? '' : 'isLimitSwitchPressed')
+    ..e<$1.BoolState>(1, _omitFieldNames ? '' : 'isMoving', $pb.PbFieldType.OE, defaultOrMaker: $1.BoolState.BOOL_UNDEFINED, valueOf: $1.BoolState.valueOf, enumValues: $1.BoolState.values)
+    ..e<$1.BoolState>(2, _omitFieldNames ? '' : 'isLimitSwitchPressed', $pb.PbFieldType.OE, defaultOrMaker: $1.BoolState.BOOL_UNDEFINED, valueOf: $1.BoolState.valueOf, enumValues: $1.BoolState.values)
     ..e<MotorDirection>(3, _omitFieldNames ? '' : 'direction', $pb.PbFieldType.OE, defaultOrMaker: MotorDirection.MOTOR_DIRECTION_UNDEFINED, valueOf: MotorDirection.valueOf, enumValues: MotorDirection.values)
     ..a<$core.int>(4, _omitFieldNames ? '' : 'currentStep', $pb.PbFieldType.O3)
     ..a<$core.int>(5, _omitFieldNames ? '' : 'targetStep', $pb.PbFieldType.O3)
@@ -163,18 +163,18 @@ class MotorData extends $pb.GeneratedMessage {
   static MotorData? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $core.bool get isMoving => $_getBF(0);
+  $1.BoolState get isMoving => $_getN(0);
   @$pb.TagNumber(1)
-  set isMoving($core.bool v) { $_setBool(0, v); }
+  set isMoving($1.BoolState v) { setField(1, v); }
   @$pb.TagNumber(1)
   $core.bool hasIsMoving() => $_has(0);
   @$pb.TagNumber(1)
   void clearIsMoving() => clearField(1);
 
   @$pb.TagNumber(2)
-  $core.bool get isLimitSwitchPressed => $_getBF(1);
+  $1.BoolState get isLimitSwitchPressed => $_getN(1);
   @$pb.TagNumber(2)
-  set isLimitSwitchPressed($core.bool v) { $_setBool(1, v); }
+  set isLimitSwitchPressed($1.BoolState v) { setField(2, v); }
   @$pb.TagNumber(2)
   $core.bool hasIsLimitSwitchPressed() => $_has(1);
   @$pb.TagNumber(2)

diff --git a/lib/src/generated/arm.pbjson.dart b/lib/src/generated/arm.pbjson.dart
@@ -56,8 +56,8 @@ final $typed_data.Uint8List coordinatesDescriptor = $convert.base64Decode(
 const MotorData$json = {
   '1': 'MotorData',
   '2': [
-    {'1': 'is_moving', '3': 1, '4': 1, '5': 8, '10': 'isMoving'},
-    {'1': 'is_limit_switch_pressed', '3': 2, '4': 1, '5': 8, '10': 'isLimitSwitchPressed'},
+    {'1': 'is_moving', '3': 1, '4': 1, '5': 14, '6': '.BoolState', '10': 'isMoving'},
+    {'1': 'is_limit_switch_pressed', '3': 2, '4': 1, '5': 14, '6': '.BoolState', '10': 'isLimitSwitchPressed'},
     {'1': 'direction', '3': 3, '4': 1, '5': 14, '6': '.MotorDirection', '10': 'direction'},
     {'1': 'current_step', '3': 4, '4': 1, '5': 5, '10': 'currentStep'},
     {'1': 'target_step', '3': 5, '4': 1, '5': 5, '10': 'targetStep'},
@@ -67,11 +67,11 @@ const MotorData$json = {
 
 /// Descriptor for `MotorData`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List motorDataDescriptor = $convert.base64Decode(
-    'CglNb3RvckRhdGESGwoJaXNfbW92aW5nGAEgASgIUghpc01vdmluZxI1Chdpc19saW1pdF9zd2'
-    'l0Y2hfcHJlc3NlZBgCIAEoCFIUaXNMaW1pdFN3aXRjaFByZXNzZWQSLQoJZGlyZWN0aW9uGAMg'
-    'ASgOMg8uTW90b3JEaXJlY3Rpb25SCWRpcmVjdGlvbhIhCgxjdXJyZW50X3N0ZXAYBCABKAVSC2'
-    'N1cnJlbnRTdGVwEh8KC3RhcmdldF9zdGVwGAUgASgFUgp0YXJnZXRTdGVwEhQKBWFuZ2xlGAYg'
-    'ASgCUgVhbmdsZQ==');
+    'CglNb3RvckRhdGESJwoJaXNfbW92aW5nGAEgASgOMgouQm9vbFN0YXRlUghpc01vdmluZxJBCh'
+    'dpc19saW1pdF9zd2l0Y2hfcHJlc3NlZBgCIAEoDjIKLkJvb2xTdGF0ZVIUaXNMaW1pdFN3aXRj'
+    'aFByZXNzZWQSLQoJZGlyZWN0aW9uGAMgASgOMg8uTW90b3JEaXJlY3Rpb25SCWRpcmVjdGlvbh'
+    'IhCgxjdXJyZW50X3N0ZXAYBCABKAVSC2N1cnJlbnRTdGVwEh8KC3RhcmdldF9zdGVwGAUgASgF'
+    'Ugp0YXJnZXRTdGVwEhQKBWFuZ2xlGAYgASgCUgVhbmdsZQ==');
 
 @$core.Deprecated('Use motorCommandDescriptor instead')
 const MotorCommand$json = {

diff --git a/lib/src/serial/firmware.dart b/lib/src/serial/firmware.dart
@@ -11,7 +11,7 @@ import "package:burt_network/burt_network.dart";
 /// reset the device and close the connection.
 class BurtFirmwareSerial extends Service {
   /// The interval to read serial data at.
-  static const readInterval = Duration(milliseconds: 100);
+  static const readInterval = Duration(milliseconds: 10);
   /// How long it should take for a firmware device to respond to a handshake.
   static const handshakeDelay = Duration(milliseconds: 200);
   /// The reset code to send to a firmware device.

diff --git a/lib/src/serial/port_delegate.dart b/lib/src/serial/port_delegate.dart
@@ -23,7 +23,6 @@ class DelegateSerialPort extends SerialPortInterface {
       _delegate = SerialPort(portName);
       return _delegate!.openReadWrite();
     } catch (error) {
-	print("Delegate failed to open port $portName\n  $error");
       return false;
     }
   }