diff options
| author | Julian Oes <julian@oes.ch> | 2013-10-19 11:39:31 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-10-19 11:39:31 +0200 |
| commit | 70ec68ffd07124b32a8957389cd29d837539e561 (patch) | |
| tree | 39d6fa57a2ebd4ebf157c2a07916a800b9b99bd2 /src/modules/uORB | |
| parent | ba77836000eaa28041969577482e3e4074d11e1b (diff) | |
| parent | 9b22de147c07a5f45f597d7fe1ed0af5cf2d5628 (diff) | |
| download | px4-firmware-70ec68ffd07124b32a8957389cd29d837539e561.tar.gz px4-firmware-70ec68ffd07124b32a8957389cd29d837539e561.tar.bz2 px4-firmware-70ec68ffd07124b32a8957389cd29d837539e561.zip | |
Merge remote-tracking branch 'px4/master' into pwm_ioctls
Conflicts:
src/drivers/px4io/px4io.cpp
Diffstat (limited to 'src/modules/uORB')
| -rw-r--r-- | src/modules/uORB/topics/vehicle_control_mode.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/modules/uORB/topics/vehicle_control_mode.h b/src/modules/uORB/topics/vehicle_control_mode.h index 093c6775d..38fb74c9b 100644 --- a/src/modules/uORB/topics/vehicle_control_mode.h +++ b/src/modules/uORB/topics/vehicle_control_mode.h @@ -61,7 +61,6 @@ */ struct vehicle_control_mode_s { - uint16_t counter; /**< incremented by the writing thread every time new data is stored */ uint64_t timestamp; /**< in microseconds since system start, is set whenever the writing thread stores new data */ bool flag_armed; |