rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

OP-1900 Fixed Constructor calling chain

Browse Source
This commit is contained in:
Corvus Corax 2015-05-23 17:11:19 +02:00
parent ffcd058478
commit 4b7edee534
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/modules/PathFollower/fixedwingautotakeoffcontroller.cpp
View File

@ -43,6 +43,10 @@ extern "C" {
// Private constants
// pointer to a singleton instance
FixedWingAutoTakeoffController *FixedWingAutoTakeoffController::p_inst = 0;
// Called when mode first engaged
void FixedWingAutoTakeoffController::Activate(void)
{

10
flight/modules/PathFollower/inc/fixedwingautotakeoffcontroller.h
View File

@ -43,7 +43,17 @@ typedef enum {
} FixedWingAutoTakeoffControllerState_T;
class FixedWingAutoTakeoffController : public FixedWingFlyController {
protected:
static FixedWingAutoTakeoffController *p_inst;
public:
static FixedWingFlyController *instance()
{
if (!p_inst) {
p_inst = new FixedWingAutoTakeoffController();
}
return p_inst;
}
void Activate(void);
void UpdateAutoPilot(void);

2
flight/modules/PathFollower/inc/fixedwingflycontroller.h
View File

@ -33,7 +33,7 @@
#include "pathfollowercontrol.h"
class FixedWingFlyController : public PathFollowerControl {
private:
protected:
static FixedWingFlyController *p_inst;
FixedWingFlyController();