diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-28 08:51:23 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-28 08:51:23 +0200 |
| commit | 8c434bc5790bfa871435398ed68f298f840fe50b (patch) | |
| tree | da63cf15f114246cff9803fb36d3cf32dda6fc9f /src | |
| parent | b84cfea455ea801593b4ee04419417dcc7c4d4f7 (diff) | |
| parent | f6eff64d1147882fa5476341b13a650f7ad267ac (diff) | |
| download | px4-firmware-8c434bc5790bfa871435398ed68f298f840fe50b.tar.gz px4-firmware-8c434bc5790bfa871435398ed68f298f840fe50b.tar.bz2 px4-firmware-8c434bc5790bfa871435398ed68f298f840fe50b.zip | |
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/ekf_att_pos_estimator/estimator.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/ekf_att_pos_estimator/estimator.cpp b/src/modules/ekf_att_pos_estimator/estimator.cpp index 23ecd89ac..5db1adbb3 100644 --- a/src/modules/ekf_att_pos_estimator/estimator.cpp +++ b/src/modules/ekf_att_pos_estimator/estimator.cpp @@ -5,7 +5,7 @@ // Define EKF_DEBUG here to enable the debug print calls // if the macro is not set, these will be completely // optimized out by the compiler. -#define EKF_DEBUG +//#define EKF_DEBUG #ifdef EKF_DEBUG #include <stdio.h> diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 28dd97fca..bb1ad86ef 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -415,7 +415,7 @@ Mavlink::instance_exists(const char *device_name, Mavlink *self) void Mavlink::forward_message(mavlink_message_t *msg, Mavlink *self) { - + Mavlink *inst; LL_FOREACH(_mavlink_instances, inst) { if (inst != self) { @@ -886,7 +886,7 @@ int Mavlink::map_mavlink_mission_item_to_mission_item(const mavlink_mission_item switch (mavlink_mission_item->command) { case MAV_CMD_NAV_TAKEOFF: - mission_item->pitch_min = mavlink_mission_item->param2; + mission_item->pitch_min = mavlink_mission_item->param1; break; default: |