diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-08 14:24:40 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-05-08 14:24:40 +0200 |
| commit | be803fdf5bd1311da15d9828096cf8f75fd8a108 (patch) | |
| tree | 5c01a3f537aa0ad306a7821e4b95f2f461edd500 | |
| parent | ec5602e45d51e500327bd3aa08d4a3d678573936 (diff) | |
| parent | 45be38c33363921b00ff764da7f87aaf8ec591c5 (diff) | |
| download | px4-firmware-be803fdf5bd1311da15d9828096cf8f75fd8a108.tar.gz px4-firmware-be803fdf5bd1311da15d9828096cf8f75fd8a108.tar.bz2 px4-firmware-be803fdf5bd1311da15d9828096cf8f75fd8a108.zip | |
Merge branch 'master' into uavcan
| -rw-r--r-- | src/drivers/px4fmu/fmu.cpp | 3 | ||||
| -rw-r--r-- | src/modules/mavlink/mavlink_main.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/drivers/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp index e81902494..ddb16401b 100644 --- a/src/drivers/px4fmu/fmu.cpp +++ b/src/drivers/px4fmu/fmu.cpp @@ -559,13 +559,12 @@ PX4FMU::task_main() } /* 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); /* this would be bad... */ if (ret < 0) { log("poll error %d", errno); - usleep(1000000); continue; } else if (ret == 0) { diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp index 7ecca0d65..833de5a3d 100644 --- a/src/modules/mavlink/mavlink_main.cpp +++ b/src/modules/mavlink/mavlink_main.cpp @@ -1535,6 +1535,8 @@ Mavlink::mavlink_missionlib_send_gcs_string(const char *string) { const int len = MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN; mavlink_statustext_t statustext; + statustext.severity = MAV_SEVERITY_INFO; + int i = 0; while (i < len - 1) { |