Tidy up lidar tracker and its protos

persontracking/lidar_tracker_pb2.py

@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: lidar_tracker.proto
+# source: persontracking/lidar_tracker.proto
 
 import sys
 _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
@@ -16,11 +15,11 @@ _sym_db = _symbol_database.Default()
 
 
 DESCRIPTOR = _descriptor.FileDescriptor(
-  name='lidar_tracker.proto',
+  name='persontracking/lidar_tracker.proto',
   package='persontracking',
   syntax='proto3',
   serialized_options=_b('\n\031com.example.carcontrollerB\021MotorServiceProtoP\001'),
-  serialized_pb=_b('\n\x13lidar_tracker.proto\x12\x0epersontracking\"\x1b\n\nInt32Value\x12\r\n\x05value\x18\x01 \x01(\x05\"\x07\n\x05\x45mpty\">\n\x05Point\x12\r\n\x05\x61ngle\x18\x01 \x01(\x01\x12\x10\n\x08\x64istance\x18\x02 \x01(\x05\x12\x14\n\x0cgroup_number\x18\x03 \x01(\x05\"2\n\tPointScan\x12%\n\x06points\x18\x01 \x03(\x0b\x32\x15.persontracking.Point2\xe1\x01\n\x0ePersonTracking\x12I\n\x12set_tracking_group\x12\x1a.persontracking.Int32Value\x1a\x15.persontracking.Empty\"\x00\x12?\n\rstop_tracking\x12\x15.persontracking.Empty\x1a\x15.persontracking.Empty\"\x00\x12\x43\n\rget_scan_data\x12\x15.persontracking.Empty\x1a\x19.persontracking.PointScan\"\x00\x42\x30\n\x19\x63om.example.carcontrollerB\x11MotorServiceProtoP\x01\x62\x06proto3')
+  serialized_pb=_b('\n\"persontracking/lidar_tracker.proto\x12\x0epersontracking\"\x1b\n\nInt32Value\x12\r\n\x05value\x18\x01 \x01(\x05\"\x07\n\x05\x45mpty\">\n\x05Point\x12\r\n\x05\x61ngle\x18\x01 \x01(\x01\x12\x10\n\x08\x64istance\x18\x02 \x01(\x05\x12\x14\n\x0cgroup_number\x18\x03 \x01(\x05\"2\n\tPointScan\x12%\n\x06points\x18\x01 \x03(\x0b\x32\x15.persontracking.Point2\xe3\x01\n\x0ePersonTracking\x12I\n\x12set_tracking_group\x12\x1a.persontracking.Int32Value\x1a\x15.persontracking.Empty\"\x00\x12?\n\rstop_tracking\x12\x15.persontracking.Empty\x1a\x15.persontracking.Empty\"\x00\x12\x45\n\x0estart_tracking\x12\x1a.persontracking.Int32Value\x1a\x15.persontracking.Empty\"\x00\x42\x30\n\x19\x63om.example.carcontrollerB\x11MotorServiceProtoP\x01\x62\x06proto3')
 )
 
 
@@ -52,8 +51,8 @@ _INT32VALUE = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=39,
-  serialized_end=66,
+  serialized_start=54,
+  serialized_end=81,
 )
 
 
@@ -76,8 +75,8 @@ _EMPTY = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=68,
-  serialized_end=75,
+  serialized_start=83,
+  serialized_end=90,
 )
 
 
@@ -121,8 +120,8 @@ _POINT = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=77,
-  serialized_end=139,
+  serialized_start=92,
+  serialized_end=154,
 )
 
 
@@ -152,8 +151,8 @@ _POINTSCAN = _descriptor.Descriptor(
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=141,
-  serialized_end=191,
+  serialized_start=156,
+  serialized_end=206,
 )
 
 _POINTSCAN.fields_by_name['points'].message_type = _POINT
@@ -163,32 +162,32 @@ DESCRIPTOR.message_types_by_name['Point'] = _POINT
 DESCRIPTOR.message_types_by_name['PointScan'] = _POINTSCAN
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
-Int32Value = _reflection.GeneratedProtocolMessageType('Int32Value', (_message.Message,), {
-  'DESCRIPTOR' : _INT32VALUE,
-  '__module__' : 'lidar_tracker_pb2'
+Int32Value = _reflection.GeneratedProtocolMessageType('Int32Value', (_message.Message,), dict(
+  DESCRIPTOR = _INT32VALUE,
+  __module__ = 'persontracking.lidar_tracker_pb2'
   # @@protoc_insertion_point(class_scope:persontracking.Int32Value)
-  })
+  ))
 _sym_db.RegisterMessage(Int32Value)
 
-Empty = _reflection.GeneratedProtocolMessageType('Empty', (_message.Message,), {
-  'DESCRIPTOR' : _EMPTY,
-  '__module__' : 'lidar_tracker_pb2'
+Empty = _reflection.GeneratedProtocolMessageType('Empty', (_message.Message,), dict(
+  DESCRIPTOR = _EMPTY,
+  __module__ = 'persontracking.lidar_tracker_pb2'
   # @@protoc_insertion_point(class_scope:persontracking.Empty)
-  })
+  ))
 _sym_db.RegisterMessage(Empty)
 
-Point = _reflection.GeneratedProtocolMessageType('Point', (_message.Message,), {
-  'DESCRIPTOR' : _POINT,
-  '__module__' : 'lidar_tracker_pb2'
+Point = _reflection.GeneratedProtocolMessageType('Point', (_message.Message,), dict(
+  DESCRIPTOR = _POINT,
+  __module__ = 'persontracking.lidar_tracker_pb2'
   # @@protoc_insertion_point(class_scope:persontracking.Point)
-  })
+  ))
 _sym_db.RegisterMessage(Point)
 
-PointScan = _reflection.GeneratedProtocolMessageType('PointScan', (_message.Message,), {
-  'DESCRIPTOR' : _POINTSCAN,
-  '__module__' : 'lidar_tracker_pb2'
+PointScan = _reflection.GeneratedProtocolMessageType('PointScan', (_message.Message,), dict(
+  DESCRIPTOR = _POINTSCAN,
+  __module__ = 'persontracking.lidar_tracker_pb2'
   # @@protoc_insertion_point(class_scope:persontracking.PointScan)
-  })
+  ))
 _sym_db.RegisterMessage(PointScan)
 
 
@@ -200,8 +199,8 @@ _PERSONTRACKING = _descriptor.ServiceDescriptor(
   file=DESCRIPTOR,
   index=0,
   serialized_options=None,
-  serialized_start=194,
-  serialized_end=419,
+  serialized_start=209,
+  serialized_end=436,
   methods=[
   _descriptor.MethodDescriptor(
     name='set_tracking_group',
@@ -222,12 +221,12 @@ _PERSONTRACKING = _descriptor.ServiceDescriptor(
     serialized_options=None,
   ),
   _descriptor.MethodDescriptor(
-    name='get_scan_data',
-    full_name='persontracking.PersonTracking.get_scan_data',
+    name='start_tracking',
+    full_name='persontracking.PersonTracking.start_tracking',
     index=2,
     containing_service=None,
-    input_type=_EMPTY,
-    output_type=_POINTSCAN,
+    input_type=_INT32VALUE,
+    output_type=_EMPTY,
     serialized_options=None,
   ),
 ])