diff --git a/class_model/src/proto/__pycache__/complex_pb2.cpython-310.pyc b/class_model/src/proto/__pycache__/complex_pb2.cpython-310.pyc deleted file mode 100644 index d1e4a5f..0000000 Binary files a/class_model/src/proto/__pycache__/complex_pb2.cpython-310.pyc and /dev/null differ diff --git a/class_model/src/proto/__pycache__/duration_pb2.cpython-310.pyc b/class_model/src/proto/__pycache__/duration_pb2.cpython-310.pyc deleted file mode 100644 index f36d808..0000000 Binary files a/class_model/src/proto/__pycache__/duration_pb2.cpython-310.pyc and /dev/null differ diff --git a/class_model/src/proto/__pycache__/enumeration_pb2.cpython-310.pyc b/class_model/src/proto/__pycache__/enumeration_pb2.cpython-310.pyc deleted file mode 100644 index 40a46ae..0000000 Binary files a/class_model/src/proto/__pycache__/enumeration_pb2.cpython-310.pyc and /dev/null differ diff --git a/class_model/src/proto/__pycache__/flight_information_pb2.cpython-310.pyc b/class_model/src/proto/__pycache__/flight_information_pb2.cpython-310.pyc deleted file mode 100644 index efee870..0000000 Binary files a/class_model/src/proto/__pycache__/flight_information_pb2.cpython-310.pyc and /dev/null differ diff --git a/class_model/src/proto/__pycache__/flight_information_pb2.cpython-38.pyc b/class_model/src/proto/__pycache__/flight_information_pb2.cpython-38.pyc deleted file mode 100644 index db38f08..0000000 Binary files a/class_model/src/proto/__pycache__/flight_information_pb2.cpython-38.pyc and /dev/null differ diff --git a/class_model/src/proto/__pycache__/flyformatioln_pb2.cpython-310.pyc b/class_model/src/proto/__pycache__/flyformatioln_pb2.cpython-310.pyc deleted file mode 100644 index 797e20a..0000000 Binary files a/class_model/src/proto/__pycache__/flyformatioln_pb2.cpython-310.pyc and /dev/null differ diff --git a/class_model/src/proto/__pycache__/flyformatioln_pb2.cpython-38.pyc b/class_model/src/proto/__pycache__/flyformatioln_pb2.cpython-38.pyc deleted file mode 100644 index 3495d77..0000000 Binary files a/class_model/src/proto/__pycache__/flyformatioln_pb2.cpython-38.pyc and /dev/null differ diff --git a/class_model/src/proto/__pycache__/maps_pb2.cpython-310.pyc b/class_model/src/proto/__pycache__/maps_pb2.cpython-310.pyc deleted file mode 100644 index 1059191..0000000 Binary files a/class_model/src/proto/__pycache__/maps_pb2.cpython-310.pyc and /dev/null differ diff --git a/class_model/src/proto/__pycache__/oneofs_pb2.cpython-310.pyc b/class_model/src/proto/__pycache__/oneofs_pb2.cpython-310.pyc deleted file mode 100644 index 9260684..0000000 Binary files a/class_model/src/proto/__pycache__/oneofs_pb2.cpython-310.pyc and /dev/null differ diff --git a/class_model/src/proto/__pycache__/simple_pb2.cpython-310.pyc b/class_model/src/proto/__pycache__/simple_pb2.cpython-310.pyc deleted file mode 100644 index 59b8b60..0000000 Binary files a/class_model/src/proto/__pycache__/simple_pb2.cpython-310.pyc and /dev/null differ diff --git a/class_model/src/proto/__pycache__/time_pb2.cpython-310.pyc b/class_model/src/proto/__pycache__/time_pb2.cpython-310.pyc deleted file mode 100644 index 3321f05..0000000 Binary files a/class_model/src/proto/__pycache__/time_pb2.cpython-310.pyc and /dev/null differ diff --git a/class_model/src/proto/flight_information.proto b/class_model/src/proto/flight_information.proto index d377017..a53b4f3 100644 --- a/class_model/src/proto/flight_information.proto +++ b/class_model/src/proto/flight_information.proto @@ -3,12 +3,12 @@ syntax = 'proto3'; // GPS + compass message GPS { - float LAT = 1; - float LON = 2; - float ALT = 3; + optional float LAT = 1; + optional float LON = 2; + optional float ALT = 3; } message flight_information_message { GPS gps = 1; - float heading = 2; + optional float heading = 2; } \ No newline at end of file diff --git a/class_model/src/proto/flight_information_pb2.py b/class_model/src/proto/flight_information_pb2.py index 24e9adc..63c28d4 100644 --- a/class_model/src/proto/flight_information_pb2.py +++ b/class_model/src/proto/flight_information_pb2.py @@ -1,11 +1,10 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: flight_information.proto - -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database # @@protoc_insertion_point(imports) @@ -14,117 +13,15 @@ _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor.FileDescriptor( - name='flight_information.proto', - package='', - syntax='proto3', - serialized_options=None, - serialized_pb=_b('\n\x18\x66light_information.proto\",\n\x03GPS\x12\x0b\n\x03LAT\x18\x01 \x01(\x02\x12\x0b\n\x03LON\x18\x02 \x01(\x02\x12\x0b\n\x03\x41LT\x18\x03 \x01(\x02\"@\n\x1a\x66light_information_message\x12\x11\n\x03gps\x18\x01 \x01(\x0b\x32\x04.GPS\x12\x0f\n\x07heading\x18\x02 \x01(\x02\x62\x06proto3') -) - - - - -_GPS = _descriptor.Descriptor( - name='GPS', - full_name='GPS', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='LAT', full_name='GPS.LAT', index=0, - number=1, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='LON', full_name='GPS.LON', index=1, - number=2, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='ALT', full_name='GPS.ALT', index=2, - number=3, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=28, - serialized_end=72, -) - - -_FLIGHT_INFORMATION_MESSAGE = _descriptor.Descriptor( - name='flight_information_message', - full_name='flight_information_message', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='gps', full_name='flight_information_message.gps', index=0, - number=1, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - _descriptor.FieldDescriptor( - name='heading', full_name='flight_information_message.heading', index=1, - number=2, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=74, - serialized_end=138, -) - -_FLIGHT_INFORMATION_MESSAGE.fields_by_name['gps'].message_type = _GPS -DESCRIPTOR.message_types_by_name['GPS'] = _GPS -DESCRIPTOR.message_types_by_name['flight_information_message'] = _FLIGHT_INFORMATION_MESSAGE -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -GPS = _reflection.GeneratedProtocolMessageType('GPS', (_message.Message,), dict( - DESCRIPTOR = _GPS, - __module__ = 'flight_information_pb2' - # @@protoc_insertion_point(class_scope:GPS) - )) -_sym_db.RegisterMessage(GPS) - -flight_information_message = _reflection.GeneratedProtocolMessageType('flight_information_message', (_message.Message,), dict( - DESCRIPTOR = _FLIGHT_INFORMATION_MESSAGE, - __module__ = 'flight_information_pb2' - # @@protoc_insertion_point(class_scope:flight_information_message) - )) -_sym_db.RegisterMessage(flight_information_message) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x18\x66light_information.proto\"S\n\x03GPS\x12\x10\n\x03LAT\x18\x01 \x01(\x02H\x00\x88\x01\x01\x12\x10\n\x03LON\x18\x02 \x01(\x02H\x01\x88\x01\x01\x12\x10\n\x03\x41LT\x18\x03 \x01(\x02H\x02\x88\x01\x01\x42\x06\n\x04_LATB\x06\n\x04_LONB\x06\n\x04_ALT\"Q\n\x1a\x66light_information_message\x12\x11\n\x03gps\x18\x01 \x01(\x0b\x32\x04.GPS\x12\x14\n\x07heading\x18\x02 \x01(\x02H\x00\x88\x01\x01\x42\n\n\x08_headingb\x06proto3') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flight_information_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _GPS._serialized_start=28 + _GPS._serialized_end=111 + _FLIGHT_INFORMATION_MESSAGE._serialized_start=113 + _FLIGHT_INFORMATION_MESSAGE._serialized_end=194 # @@protoc_insertion_point(module_scope) diff --git a/class_model/src/proto/flyformatioln.proto b/class_model/src/proto/flyformatioln.proto index c209dc0..8825dcb 100644 --- a/class_model/src/proto/flyformatioln.proto +++ b/class_model/src/proto/flyformatioln.proto @@ -12,6 +12,6 @@ enum FLY_FORMATION{ FLY_FORMATION_HEX = 6; } message fly_formation_message{ - float velocity = 1; + optional float velocity = 1; FLY_FORMATION fly_formation= 2; } \ No newline at end of file diff --git a/class_model/src/proto/flyformatioln_pb2.py b/class_model/src/proto/flyformatioln_pb2.py index 40f4aa3..ef2a0e0 100644 --- a/class_model/src/proto/flyformatioln_pb2.py +++ b/class_model/src/proto/flyformatioln_pb2.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: flyformatioln.proto - -from google.protobuf.internal import enum_type_wrapper +"""Generated protocol buffer code.""" +from google.protobuf.internal import builder as _builder from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import symbol_database as _symbol_database # @@protoc_insertion_point(imports) @@ -14,125 +13,15 @@ _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor.FileDescriptor( - name='flyformatioln.proto', - package='', - syntax='proto3', - serialized_options=None, - create_key=_descriptor._internal_create_key, - serialized_pb=b'\n\x13\x66lyformatioln.proto\"P\n\x15\x66ly_formation_message\x12\x10\n\x08velocity\x18\x01 \x01(\x02\x12%\n\rfly_formation\x18\x02 \x01(\x0e\x32\x0e.FLY_FORMATION*\xb3\x01\n\rFLY_FORMATION\x12\x1d\n\x19\x46LY_FORMATION_UNSPECIFIED\x10\x00\x12\x13\n\x0f\x46LY_FORMATION_v\x10\x01\x12\x13\n\x0f\x46LY_FORMATION_X\x10\x02\x12\x13\n\x0f\x46LY_FORMATION_O\x10\x03\x12\x16\n\x12\x46LY_FORMATION_LINE\x10\x04\x12\x15\n\x11\x46LY_FORMATION_ROW\x10\x05\x12\x15\n\x11\x46LY_FORMATION_HEX\x10\x06\x62\x06proto3' -) - -_FLY_FORMATION = _descriptor.EnumDescriptor( - name='FLY_FORMATION', - full_name='FLY_FORMATION', - filename=None, - file=DESCRIPTOR, - create_key=_descriptor._internal_create_key, - values=[ - _descriptor.EnumValueDescriptor( - name='FLY_FORMATION_UNSPECIFIED', index=0, number=0, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='FLY_FORMATION_v', index=1, number=1, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='FLY_FORMATION_X', index=2, number=2, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='FLY_FORMATION_O', index=3, number=3, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='FLY_FORMATION_LINE', index=4, number=4, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='FLY_FORMATION_ROW', index=5, number=5, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - _descriptor.EnumValueDescriptor( - name='FLY_FORMATION_HEX', index=6, number=6, - serialized_options=None, - type=None, - create_key=_descriptor._internal_create_key), - ], - containing_type=None, - serialized_options=None, - serialized_start=106, - serialized_end=285, -) -_sym_db.RegisterEnumDescriptor(_FLY_FORMATION) - -FLY_FORMATION = enum_type_wrapper.EnumTypeWrapper(_FLY_FORMATION) -FLY_FORMATION_UNSPECIFIED = 0 -FLY_FORMATION_v = 1 -FLY_FORMATION_X = 2 -FLY_FORMATION_O = 3 -FLY_FORMATION_LINE = 4 -FLY_FORMATION_ROW = 5 -FLY_FORMATION_HEX = 6 - - - -_FLY_FORMATION_MESSAGE = _descriptor.Descriptor( - name='fly_formation_message', - full_name='fly_formation_message', - filename=None, - file=DESCRIPTOR, - containing_type=None, - create_key=_descriptor._internal_create_key, - fields=[ - _descriptor.FieldDescriptor( - name='velocity', full_name='fly_formation_message.velocity', index=0, - number=1, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=float(0), - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - _descriptor.FieldDescriptor( - name='fly_formation', full_name='fly_formation_message.fly_formation', index=1, - number=2, type=14, cpp_type=8, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - serialized_options=None, file=DESCRIPTOR, create_key=_descriptor._internal_create_key), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - serialized_options=None, - is_extendable=False, - syntax='proto3', - extension_ranges=[], - oneofs=[ - ], - serialized_start=23, - serialized_end=103, -) - -_FLY_FORMATION_MESSAGE.fields_by_name['fly_formation'].enum_type = _FLY_FORMATION -DESCRIPTOR.message_types_by_name['fly_formation_message'] = _FLY_FORMATION_MESSAGE -DESCRIPTOR.enum_types_by_name['FLY_FORMATION'] = _FLY_FORMATION -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - -fly_formation_message = _reflection.GeneratedProtocolMessageType('fly_formation_message', (_message.Message,), { - 'DESCRIPTOR' : _FLY_FORMATION_MESSAGE, - '__module__' : 'flyformatioln_pb2' - # @@protoc_insertion_point(class_scope:fly_formation_message) - }) -_sym_db.RegisterMessage(fly_formation_message) +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13\x66lyformatioln.proto\"b\n\x15\x66ly_formation_message\x12\x15\n\x08velocity\x18\x01 \x01(\x02H\x00\x88\x01\x01\x12%\n\rfly_formation\x18\x02 \x01(\x0e\x32\x0e.FLY_FORMATIONB\x0b\n\t_velocity*\xb3\x01\n\rFLY_FORMATION\x12\x1d\n\x19\x46LY_FORMATION_UNSPECIFIED\x10\x00\x12\x13\n\x0f\x46LY_FORMATION_v\x10\x01\x12\x13\n\x0f\x46LY_FORMATION_X\x10\x02\x12\x13\n\x0f\x46LY_FORMATION_O\x10\x03\x12\x16\n\x12\x46LY_FORMATION_LINE\x10\x04\x12\x15\n\x11\x46LY_FORMATION_ROW\x10\x05\x12\x15\n\x11\x46LY_FORMATION_HEX\x10\x06\x62\x06proto3') +_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals()) +_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'flyformatioln_pb2', globals()) +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + _FLY_FORMATION._serialized_start=124 + _FLY_FORMATION._serialized_end=303 + _FLY_FORMATION_MESSAGE._serialized_start=23 + _FLY_FORMATION_MESSAGE._serialized_end=121 # @@protoc_insertion_point(module_scope)