diff options
| author | Julian Oes <julian@oes.ch> | 2014-07-07 15:13:27 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-07-07 15:13:27 +0200 |
| commit | 530e70bc4697a7e436a4cc9557ce38e139ee2795 (patch) | |
| tree | 46cdb53923a34396ea882ad2dcc836f856d77564 /src/modules/navigator/navigator.h | |
| parent | 407eafbdbb3a81a8d2e9b30ae0757a9f1862c467 (diff) | |
| download | px4-firmware-530e70bc4697a7e436a4cc9557ce38e139ee2795.tar.gz px4-firmware-530e70bc4697a7e436a4cc9557ce38e139ee2795.tar.bz2 px4-firmware-530e70bc4697a7e436a4cc9557ce38e139ee2795.zip | |
navigator: forgot to fix conflicts
Diffstat (limited to 'src/modules/navigator/navigator.h')
| -rw-r--r-- | src/modules/navigator/navigator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules/navigator/navigator.h b/src/modules/navigator/navigator.h index ae2e01c8c..bf6e2ea0e 100644 --- a/src/modules/navigator/navigator.h +++ b/src/modules/navigator/navigator.h @@ -113,7 +113,7 @@ public: struct vehicle_control_mode_s* get_control_mode() { return &_control_mode; } struct vehicle_global_position_s* get_global_position() { return &_global_pos; } struct home_position_s* get_home_position() { return &_home_pos; } - + struct position_setpoint_triplet_s* get_position_setpoint_triplet() { return &_pos_sp_triplet; } int get_onboard_mission_sub() { return _onboard_mission_sub; } int get_offboard_mission_sub() { return _offboard_mission_sub; } int get_offboard_control_sp_sub() { return _offboard_control_sp_sub; } |