diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-15 12:42:28 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-15 12:42:28 +0100 |
| commit | 96db9e81883ab0e3438e8ffdce8e8dce47d204ce (patch) | |
| tree | 2d41d99f2837630219cc56699b27d2a2190374aa /msg/actuator_controls_0.msg | |
| parent | e60c1a842c856e1a19fcdc1b169dfdbc813e9ce2 (diff) | |
| parent | e62bd37e73139c77f0d60cd91fe3443ed23df074 (diff) | |
| download | px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.tar.gz px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.tar.bz2 px4-firmware-96db9e81883ab0e3438e8ffdce8e8dce47d204ce.zip | |
Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
src/platforms/px4_middleware.h
Diffstat (limited to 'msg/actuator_controls_0.msg')
| -rw-r--r-- | msg/actuator_controls_0.msg | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/msg/actuator_controls_0.msg b/msg/actuator_controls_0.msg index 743f20cdf..414eb06dd 100644 --- a/msg/actuator_controls_0.msg +++ b/msg/actuator_controls_0.msg @@ -1,4 +1,5 @@ uint8 NUM_ACTUATOR_CONTROLS = 8 uint8 NUM_ACTUATOR_CONTROL_GROUPS = 4 uint64 timestamp +uint64 timestamp_sample # the timestamp the data this control response is based on was sampled float32[8] control |