aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorM.H.Kabir <mhkabir98@gmail.com>2014-12-18 13:27:37 +0530
committerM.H.Kabir <mhkabir98@gmail.com>2014-12-18 13:27:37 +0530
commit5ed11ffa8b5f2e843a661e6cf6cfb707c2d93b4e (patch)
treec11324e0209084e9851c3923e78329d0cefc1a6b /src
parentc59f20706f93908ff9137aa315e8c77cb470e298 (diff)
parent6e874bed50d6d8a13a3b7f9b883697cb2718d27b (diff)
downloadpx4-firmware-5ed11ffa8b5f2e843a661e6cf6cfb707c2d93b4e.tar.gz
px4-firmware-5ed11ffa8b5f2e843a661e6cf6cfb707c2d93b4e.tar.bz2
px4-firmware-5ed11ffa8b5f2e843a661e6cf6cfb707c2d93b4e.zip
Merge remote-tracking branch 'upstream/master' into timesync
Diffstat (limited to 'src')
-rw-r--r--src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp6
-rw-r--r--src/modules/fw_pos_control_l1/module.mk2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
index e7c95cc86..948b29bcb 100644
--- a/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
+++ b/src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
@@ -1399,8 +1399,6 @@ FixedwingPositionControl::task_main()
continue;
}
- perf_begin(_loop_perf);
-
/* check vehicle control mode for changes to publication state */
vehicle_control_mode_poll();
@@ -1419,6 +1417,7 @@ FixedwingPositionControl::task_main()
/* only run controller if position changed */
if (fds[1].revents & POLLIN) {
+ perf_begin(_loop_perf);
/* XXX Hack to get mavlink output going */
if (_mavlink_fd < 0) {
@@ -1473,10 +1472,9 @@ FixedwingPositionControl::task_main()
}
}
-
+ perf_end(_loop_perf);
}
- perf_end(_loop_perf);
}
_task_running = false;
diff --git a/src/modules/fw_pos_control_l1/module.mk b/src/modules/fw_pos_control_l1/module.mk
index 15b575b50..440bab2c5 100644
--- a/src/modules/fw_pos_control_l1/module.mk
+++ b/src/modules/fw_pos_control_l1/module.mk
@@ -45,3 +45,5 @@ SRCS = fw_pos_control_l1_main.cpp \
mtecs/mTecs_params.c
MODULE_STACKSIZE = 1200
+
+MAXOPTIMIZATION = -Os