Skip to content

Commit

Permalink
Upgraded Protobuf and regenerated
Browse files Browse the repository at this point in the history
  • Loading branch information
@Levi-Lesches
Levi-Lesches committed May 21, 2024
1 parent 7aec596 commit 8db93d3
Show file tree
Hide file tree
Showing 23 changed files with 633 additions and 264 deletions.
2 changes: 1 addition & 1 deletion Protobuf
Submodule Protobuf updated 6 files
+11 −1 arm.proto
+1 −29 core.proto
+25 −2 drive.proto
+24 −0 status.proto
+16 −0 utils.proto
+7 −1 video.proto
57 changes: 57 additions & 0 deletions lib/src/generated/arm.pb.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import 'dart:core' as $core;
import 'package:protobuf/protobuf.dart' as $pb;

import 'arm.pbenum.dart';
import 'utils.pbenum.dart' as $1;
import 'version.pb.dart' as $0;

export 'arm.pbenum.dart';
Expand Down Expand Up @@ -625,6 +626,8 @@ class GripperData extends $pb.GeneratedMessage {
MotorData? rotate,
MotorData? pinch,
$0.Version? version,
$core.int? servoAngle,
$1.BoolState? laserState,
}) {
final $result = create();
if (lift != null) {
Expand All @@ -639,6 +642,12 @@ class GripperData extends $pb.GeneratedMessage {
if (version != null) {
$result.version = version;
}
if (servoAngle != null) {
$result.servoAngle = servoAngle;
}
if (laserState != null) {
$result.laserState = laserState;
}
return $result;
}
GripperData._() : super();
Expand All @@ -650,6 +659,8 @@ class GripperData extends $pb.GeneratedMessage {
..aOM<MotorData>(2, _omitFieldNames ? '' : 'rotate', subBuilder: MotorData.create)
..aOM<MotorData>(3, _omitFieldNames ? '' : 'pinch', subBuilder: MotorData.create)
..aOM<$0.Version>(4, _omitFieldNames ? '' : 'version', subBuilder: $0.Version.create)
..a<$core.int>(5, _omitFieldNames ? '' : 'servoAngle', $pb.PbFieldType.O3, protoName: 'servoAngle')
..e<$1.BoolState>(6, _omitFieldNames ? '' : 'laserState', $pb.PbFieldType.OE, protoName: 'laserState', defaultOrMaker: $1.BoolState.BOOL_UNDEFINED, valueOf: $1.BoolState.valueOf, enumValues: $1.BoolState.values)
..hasRequiredFields = false
;

Expand Down Expand Up @@ -717,6 +728,24 @@ class GripperData extends $pb.GeneratedMessage {
void clearVersion() => clearField(4);
@$pb.TagNumber(4)
$0.Version ensureVersion() => $_ensure(3);

@$pb.TagNumber(5)
$core.int get servoAngle => $_getIZ(4);
@$pb.TagNumber(5)
set servoAngle($core.int v) { $_setSignedInt32(4, v); }
@$pb.TagNumber(5)
$core.bool hasServoAngle() => $_has(4);
@$pb.TagNumber(5)
void clearServoAngle() => clearField(5);

@$pb.TagNumber(6)
$1.BoolState get laserState => $_getN(5);
@$pb.TagNumber(6)
set laserState($1.BoolState v) { setField(6, v); }
@$pb.TagNumber(6)
$core.bool hasLaserState() => $_has(5);
@$pb.TagNumber(6)
void clearLaserState() => clearField(6);
}

class GripperCommand extends $pb.GeneratedMessage {
Expand All @@ -730,6 +759,8 @@ class GripperCommand extends $pb.GeneratedMessage {
$core.bool? close,
$core.bool? spin,
$0.Version? version,
$core.int? servoAngle,
$1.BoolState? laserState,
}) {
final $result = create();
if (stop != null) {
Expand Down Expand Up @@ -759,6 +790,12 @@ class GripperCommand extends $pb.GeneratedMessage {
if (version != null) {
$result.version = version;
}
if (servoAngle != null) {
$result.servoAngle = servoAngle;
}
if (laserState != null) {
$result.laserState = laserState;
}
return $result;
}
GripperCommand._() : super();
Expand All @@ -775,6 +812,8 @@ class GripperCommand extends $pb.GeneratedMessage {
..aOB(7, _omitFieldNames ? '' : 'close')
..aOB(8, _omitFieldNames ? '' : 'spin')
..aOM<$0.Version>(9, _omitFieldNames ? '' : 'version', subBuilder: $0.Version.create)
..a<$core.int>(10, _omitFieldNames ? '' : 'servoAngle', $pb.PbFieldType.O3, protoName: 'servoAngle')
..e<$1.BoolState>(11, _omitFieldNames ? '' : 'laserState', $pb.PbFieldType.OE, protoName: 'laserState', defaultOrMaker: $1.BoolState.BOOL_UNDEFINED, valueOf: $1.BoolState.valueOf, enumValues: $1.BoolState.values)
..hasRequiredFields = false
;

Expand Down Expand Up @@ -890,6 +929,24 @@ class GripperCommand extends $pb.GeneratedMessage {
void clearVersion() => clearField(9);
@$pb.TagNumber(9)
$0.Version ensureVersion() => $_ensure(8);

@$pb.TagNumber(10)
$core.int get servoAngle => $_getIZ(9);
@$pb.TagNumber(10)
set servoAngle($core.int v) { $_setSignedInt32(9, v); }
@$pb.TagNumber(10)
$core.bool hasServoAngle() => $_has(9);
@$pb.TagNumber(10)
void clearServoAngle() => clearField(10);

@$pb.TagNumber(11)
$1.BoolState get laserState => $_getN(10);
@$pb.TagNumber(11)
set laserState($1.BoolState v) { setField(11, v); }
@$pb.TagNumber(11)
$core.bool hasLaserState() => $_has(10);
@$pb.TagNumber(11)
void clearLaserState() => clearField(11);
}


Expand Down
12 changes: 10 additions & 2 deletions lib/src/generated/arm.pbjson.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,18 @@ const GripperData$json = {
{'1': 'rotate', '3': 2, '4': 1, '5': 11, '6': '.MotorData', '10': 'rotate'},
{'1': 'pinch', '3': 3, '4': 1, '5': 11, '6': '.MotorData', '10': 'pinch'},
{'1': 'version', '3': 4, '4': 1, '5': 11, '6': '.Version', '10': 'version'},
{'1': 'servoAngle', '3': 5, '4': 1, '5': 5, '10': 'servoAngle'},
{'1': 'laserState', '3': 6, '4': 1, '5': 14, '6': '.BoolState', '10': 'laserState'},
],
};

/// Descriptor for `GripperData`. Decode as a `google.protobuf.DescriptorProto`.
final $typed_data.Uint8List gripperDataDescriptor = $convert.base64Decode(
'CgtHcmlwcGVyRGF0YRIeCgRsaWZ0GAEgASgLMgouTW90b3JEYXRhUgRsaWZ0EiIKBnJvdGF0ZR'
'gCIAEoCzIKLk1vdG9yRGF0YVIGcm90YXRlEiAKBXBpbmNoGAMgASgLMgouTW90b3JEYXRhUgVw'
'aW5jaBIiCgd2ZXJzaW9uGAQgASgLMgguVmVyc2lvblIHdmVyc2lvbg==');
'aW5jaBIiCgd2ZXJzaW9uGAQgASgLMgguVmVyc2lvblIHdmVyc2lvbhIeCgpzZXJ2b0FuZ2xlGA'
'UgASgFUgpzZXJ2b0FuZ2xlEioKCmxhc2VyU3RhdGUYBiABKA4yCi5Cb29sU3RhdGVSCmxhc2Vy'
'U3RhdGU=');

@$core.Deprecated('Use gripperCommandDescriptor instead')
const GripperCommand$json = {
Expand All @@ -166,6 +170,8 @@ const GripperCommand$json = {
{'1': 'close', '3': 7, '4': 1, '5': 8, '10': 'close'},
{'1': 'spin', '3': 8, '4': 1, '5': 8, '10': 'spin'},
{'1': 'version', '3': 9, '4': 1, '5': 11, '6': '.Version', '10': 'version'},
{'1': 'servoAngle', '3': 10, '4': 1, '5': 5, '10': 'servoAngle'},
{'1': 'laserState', '3': 11, '4': 1, '5': 14, '6': '.BoolState', '10': 'laserState'},
],
};

Expand All @@ -175,5 +181,7 @@ final $typed_data.Uint8List gripperCommandDescriptor = $convert.base64Decode(
'IJY2FsaWJyYXRlEiEKBGxpZnQYAyABKAsyDS5Nb3RvckNvbW1hbmRSBGxpZnQSJQoGcm90YXRl'
'GAQgASgLMg0uTW90b3JDb21tYW5kUgZyb3RhdGUSIwoFcGluY2gYBSABKAsyDS5Nb3RvckNvbW'
'1hbmRSBXBpbmNoEhIKBG9wZW4YBiABKAhSBG9wZW4SFAoFY2xvc2UYByABKAhSBWNsb3NlEhIK'
'BHNwaW4YCCABKAhSBHNwaW4SIgoHdmVyc2lvbhgJIAEoCzIILlZlcnNpb25SB3ZlcnNpb24=');
'BHNwaW4YCCABKAhSBHNwaW4SIgoHdmVyc2lvbhgJIAEoCzIILlZlcnNpb25SB3ZlcnNpb24SHg'
'oKc2Vydm9BbmdsZRgKIAEoBVIKc2Vydm9BbmdsZRIqCgpsYXNlclN0YXRlGAsgASgOMgouQm9v'
'bFN0YXRlUgpsYXNlclN0YXRl');

34 changes: 17 additions & 17 deletions lib/src/generated/autonomy.pb.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ import 'dart:core' as $core;
import 'package:protobuf/protobuf.dart' as $pb;

import 'autonomy.pbenum.dart';
import 'gps.pb.dart' as $1;
import 'gps.pb.dart' as $2;
import 'version.pb.dart' as $0;

export 'autonomy.pbenum.dart';

class AutonomyData extends $pb.GeneratedMessage {
factory AutonomyData({
AutonomyState? state,
$1.GpsCoordinates? destination,
$core.Iterable<$1.GpsCoordinates>? obstacles,
$core.Iterable<$1.GpsCoordinates>? path,
$2.GpsCoordinates? destination,
$core.Iterable<$2.GpsCoordinates>? obstacles,
$core.Iterable<$2.GpsCoordinates>? path,
AutonomyTask? task,
$core.bool? crash,
$0.Version? version,
Expand Down Expand Up @@ -59,9 +59,9 @@ class AutonomyData extends $pb.GeneratedMessage {

static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AutonomyData', createEmptyInstance: create)
..e<AutonomyState>(1, _omitFieldNames ? '' : 'state', $pb.PbFieldType.OE, defaultOrMaker: AutonomyState.AUTONOMY_STATE_UNDEFINED, valueOf: AutonomyState.valueOf, enumValues: AutonomyState.values)
..aOM<$1.GpsCoordinates>(2, _omitFieldNames ? '' : 'destination', subBuilder: $1.GpsCoordinates.create)
..pc<$1.GpsCoordinates>(3, _omitFieldNames ? '' : 'obstacles', $pb.PbFieldType.PM, subBuilder: $1.GpsCoordinates.create)
..pc<$1.GpsCoordinates>(4, _omitFieldNames ? '' : 'path', $pb.PbFieldType.PM, subBuilder: $1.GpsCoordinates.create)
..aOM<$2.GpsCoordinates>(2, _omitFieldNames ? '' : 'destination', subBuilder: $2.GpsCoordinates.create)
..pc<$2.GpsCoordinates>(3, _omitFieldNames ? '' : 'obstacles', $pb.PbFieldType.PM, subBuilder: $2.GpsCoordinates.create)
..pc<$2.GpsCoordinates>(4, _omitFieldNames ? '' : 'path', $pb.PbFieldType.PM, subBuilder: $2.GpsCoordinates.create)
..e<AutonomyTask>(5, _omitFieldNames ? '' : 'task', $pb.PbFieldType.OE, defaultOrMaker: AutonomyTask.AUTONOMY_TASK_UNDEFINED, valueOf: AutonomyTask.valueOf, enumValues: AutonomyTask.values)
..aOB(6, _omitFieldNames ? '' : 'crash')
..aOM<$0.Version>(7, _omitFieldNames ? '' : 'version', subBuilder: $0.Version.create)
Expand Down Expand Up @@ -99,21 +99,21 @@ class AutonomyData extends $pb.GeneratedMessage {
void clearState() => clearField(1);

@$pb.TagNumber(2)
$1.GpsCoordinates get destination => $_getN(1);
$2.GpsCoordinates get destination => $_getN(1);
@$pb.TagNumber(2)
set destination($1.GpsCoordinates v) { setField(2, v); }
set destination($2.GpsCoordinates v) { setField(2, v); }
@$pb.TagNumber(2)
$core.bool hasDestination() => $_has(1);
@$pb.TagNumber(2)
void clearDestination() => clearField(2);
@$pb.TagNumber(2)
$1.GpsCoordinates ensureDestination() => $_ensure(1);
$2.GpsCoordinates ensureDestination() => $_ensure(1);

@$pb.TagNumber(3)
$core.List<$1.GpsCoordinates> get obstacles => $_getList(2);
$core.List<$2.GpsCoordinates> get obstacles => $_getList(2);

@$pb.TagNumber(4)
$core.List<$1.GpsCoordinates> get path => $_getList(3);
$core.List<$2.GpsCoordinates> get path => $_getList(3);

@$pb.TagNumber(5)
AutonomyTask get task => $_getN(4);
Expand Down Expand Up @@ -147,7 +147,7 @@ class AutonomyData extends $pb.GeneratedMessage {

class AutonomyCommand extends $pb.GeneratedMessage {
factory AutonomyCommand({
$1.GpsCoordinates? destination,
$2.GpsCoordinates? destination,
AutonomyTask? task,
$core.int? arucoId,
$core.bool? abort,
Expand Down Expand Up @@ -176,7 +176,7 @@ class AutonomyCommand extends $pb.GeneratedMessage {
factory AutonomyCommand.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);

static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'AutonomyCommand', createEmptyInstance: create)
..aOM<$1.GpsCoordinates>(1, _omitFieldNames ? '' : 'destination', subBuilder: $1.GpsCoordinates.create)
..aOM<$2.GpsCoordinates>(1, _omitFieldNames ? '' : 'destination', subBuilder: $2.GpsCoordinates.create)
..e<AutonomyTask>(2, _omitFieldNames ? '' : 'task', $pb.PbFieldType.OE, defaultOrMaker: AutonomyTask.AUTONOMY_TASK_UNDEFINED, valueOf: AutonomyTask.valueOf, enumValues: AutonomyTask.values)
..a<$core.int>(3, _omitFieldNames ? '' : 'arucoId', $pb.PbFieldType.O3)
..aOB(4, _omitFieldNames ? '' : 'abort')
Expand Down Expand Up @@ -206,15 +206,15 @@ class AutonomyCommand extends $pb.GeneratedMessage {
static AutonomyCommand? _defaultInstance;

@$pb.TagNumber(1)
$1.GpsCoordinates get destination => $_getN(0);
$2.GpsCoordinates get destination => $_getN(0);
@$pb.TagNumber(1)
set destination($1.GpsCoordinates v) { setField(1, v); }
set destination($2.GpsCoordinates v) { setField(1, v); }
@$pb.TagNumber(1)
$core.bool hasDestination() => $_has(0);
@$pb.TagNumber(1)
void clearDestination() => clearField(1);
@$pb.TagNumber(1)
$1.GpsCoordinates ensureDestination() => $_ensure(0);
$2.GpsCoordinates ensureDestination() => $_ensure(0);

@$pb.TagNumber(2)
AutonomyTask get task => $_getN(1);
Expand Down
Loading

0 comments on commit 8db93d3

Please sign in to comment.