@@ -17,34 +17,49 @@ package osi3;
1717//
1818message MotionRequest
1919{
20+ // The interface version used by the sender (simulation environment).
21+ //
22+ optional InterfaceVersion version = 1 ;
23+
24+ // The data timestamp of the simulation environment. Zero time is arbitrary
25+ // but must be identical for all messages. Zero time does not need to
26+ // coincide with the UNIX epoch. Recommended is the starting time point of
27+ // the simulation.
28+ //
29+ // \note For sensor view data this timestamp coincides both with the
30+ // notional simulation time the data applies to and the time it was sent
31+ // (there is no inherent latency for sensor view data, as opposed to
32+ // sensor data).
33+ //
34+ optional Timestamp timestamp = 2 ;
2035
21- //
22- // Define different options for HAD function ouput.
23- // Each option is corresponds to a field in the message.
24- //
25- enum OutputOptions
26- {
27- DESIRED_STATE = 0 ;
28- TRAJECTORY = 1 ;
29- }
30-
3136 //
3237 // Define the option that is used to specify the motion request.
3338 // This must be set. Additionally, the field corresponding to the specified option must be set.
3439 //
35- optional OutputOptions output_option = 1 ;
36-
40+ optional OutputOptions output_option = 3 ;
41+
3742 //
3843 // Defines a desired state.
3944 // If the output option is set to DESIRED_STATE, this must be provided.
4045 //
41- optional DesiredState desired_state = 2 ;
42-
46+ optional DesiredState desired_state = 4 ;
47+
4348 //
4449 // Defines a desired trajectory.
4550 // If the output option is set to DESIRED_TRAJECTORY, this must be set.
4651 //
47- optional Trajectory desired_trajectory = 3 ;
52+ optional Trajectory desired_trajectory = 5 ;
53+
54+ //
55+ // Define different options for HAD function ouput.
56+ // Each option is corresponds to a field in the message.
57+ //
58+ enum OutputOptions
59+ {
60+ DESIRED_STATE = 0 ;
61+ TRAJECTORY = 1 ;
62+ }
4863
4964 //
5065 // \brief The desired state is calculated by the HAD function as a result of the motion planning stack.
@@ -73,9 +88,8 @@ message MotionRequest
7388 // intended acceleration to be reached in x, y, and z direction
7489 //
7590 optional Vector3d acceleration = 5 ;
76-
7791 }
78-
92+
7993 //
8094 // \brief Defined trajectory desired by the HAD function. This trajectory is the result of the trajectory planning step
8195 // in the HAD function. The task of the acutator management is to follow this trajectory as closely as possible.
@@ -88,5 +102,4 @@ message MotionRequest
88102 //
89103 repeated StatePoint trajectory_point = 1 ;
90104 }
91-
92105}
0 commit comments