fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-29 12:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into uavcan

Browse Source
This commit is contained in:
Lorenz Meier
2014-05-08 14:24:40 +02:00
parent ec5602e45d 45be38c333
commit be803fdf5b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/px4fmu/fmu.cpp
+1 -2
View File
@@ -559,13 +559,12 @@ PX4FMU::task_main()
} }
/* sleep waiting for data, stopping to check for PPM /* sleep waiting for data, stopping to check for PPM
* input at 100Hz */ * input at 50Hz */
int ret = ::poll(_poll_fds, _poll_fds_num, CONTROL_INPUT_DROP_LIMIT_MS); int ret = ::poll(_poll_fds, _poll_fds_num, CONTROL_INPUT_DROP_LIMIT_MS);
/* this would be bad... */ /* this would be bad... */
if (ret < 0) { if (ret < 0) {
log("poll error %d", errno); log("poll error %d", errno);
usleep(1000000);
continue; continue;
} else if (ret == 0) { } else if (ret == 0) {
src/modules/mavlink/mavlink_main.cpp
+2
View File
@@ -1535,6 +1535,8 @@ Mavlink::mavlink_missionlib_send_gcs_string(const char *string)
{ {
const int len = MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN; const int len = MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN;
mavlink_statustext_t statustext; mavlink_statustext_t statustext;
statustext.severity = MAV_SEVERITY_INFO;
int i = 0; int i = 0;
while (i < len - 1) { while (i < len - 1) {