aboutsummaryrefslogtreecommitdiff
path: root/src/modules/navigator/mission.h
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-06-29 19:12:35 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-06-29 19:12:35 +0200
commitecee13861c498929c5c014ec8ba7744a76a01c64 (patch)
treedb18adb09d8f35121e41374fc42d6e2cb3a29a89 /src/modules/navigator/mission.h
parent164f19176e1eb0d5546a5a1b00392917e9a7b87c (diff)
parent94c69e11ae1ec44c80eec1c979201c7d7e51cdb0 (diff)
downloadpx4-firmware-ecee13861c498929c5c014ec8ba7744a76a01c64.tar.gz
px4-firmware-ecee13861c498929c5c014ec8ba7744a76a01c64.tar.bz2
px4-firmware-ecee13861c498929c5c014ec8ba7744a76a01c64.zip
Merged master
Diffstat (limited to 'src/modules/navigator/mission.h')
-rw-r--r--src/modules/navigator/mission.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/modules/navigator/mission.h b/src/modules/navigator/mission.h
index 1310671b0..7f8cdf528 100644
--- a/src/modules/navigator/mission.h
+++ b/src/modules/navigator/mission.h
@@ -62,7 +62,7 @@
class Navigator;
-class Mission : public NavigatorMode, MissionBlock
+class Mission : public MissionBlock
{
public:
/**
@@ -107,12 +107,6 @@ private:
void set_mission_items(struct position_setpoint_triplet_s *pos_sp_triplet);
/**
- * Set previous position setpoint
- */
- void set_previous_pos_setpoint(const struct position_setpoint_s *current_pos_sp,
- struct position_setpoint_s *previous_pos_sp);
-
- /**
* Try to set the current position setpoint from an onboard mission item
* @return true if mission item successfully set
*/