Astyle: Run astyle to fix code formatting

This commit is contained in:
Johan Jansen
2015-01-07 23:28:20 +01:00
parent 10a2dd8a34
commit 9ea086bf2d
7 changed files with 154 additions and 152 deletions
@@ -35,6 +35,7 @@ void LandDetector::start()
//Task is now running, keep doing so until shutdown() has been called
_taskIsRunning = true;
_taskShouldExit = false;
while (isRunning()) {
bool landDetected = update();
@@ -75,7 +75,8 @@ protected:
static constexpr float MC_LAND_DETECTOR_ROTATION_MAX = 0.5f; /**< max rotation in rad/sec (= 30 deg/s) */
static constexpr float MC_LAND_DETECTOR_THRUST_MAX = 0.2f;
static constexpr float MC_LAND_DETECTOR_VELOCITY_MAX = 1.0f; /**< max +- horizontal movement in m/s */
static constexpr uint32_t MC_LAND_DETECTOR_TRIGGER_TIME = 2000000; /**< usec that landing conditions have to hold before triggering a land */
static constexpr uint32_t MC_LAND_DETECTOR_TRIGGER_TIME =
2000000; /**< usec that landing conditions have to hold before triggering a land */
private:
int _vehicleGlobalPositionSub; /**< notification of global position */
@@ -120,11 +120,11 @@ static int land_detector_start(const char* mode)
//Allocate memory
if (!strcmp(mode, "fixedwing")) {
land_detector_task = new FixedwingLandDetector();
}
else if(!strcmp(mode, "multicopter")) {
} else if (!strcmp(mode, "multicopter")) {
land_detector_task = new MulticopterLandDetector();
}
else {
} else {
errx(1, "[mode] must be either 'fixedwing' or 'multicopter'");
return -1;
}