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

mavlink app: Be more verbose on param load fails

Browse Source
This commit is contained in:
Lorenz Meier
2015-06-23 09:36:19 +02:00
parent 4c975a11e5
commit c192398a65
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_parameters.cpp
+18 -5
View File
@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2014 PX4 Development Team. All rights reserved. * Copyright (c) 2015 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -36,6 +36,7 @@
* Mavlink parameters manager implementation. * Mavlink parameters manager implementation.
* *
* @author Anton Babushkin <anton.babushkin@me.com> * @author Anton Babushkin <anton.babushkin@me.com>
* @author Lorenz Meier <lorenz@px4.io>
*/ */
#include <stdio.h> #include <stdio.h>
@@ -130,7 +131,17 @@ MavlinkParametersManager::handle_message(const mavlink_message_t *msg)
} else { } else {
/* when index is >= 0, send this parameter again */ /* when index is >= 0, send this parameter again */
send_param(param_for_used_index(req_read.param_index)); int ret = send_param(param_for_used_index(req_read.param_index));
if (ret == 1) {
char buf[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN];
sprintf(buf, "[pm] unknown param ID: %u", req_read.param_index);
_mavlink->send_statustext_info(buf);
} else if (ret == 2) {
char buf[MAVLINK_MSG_STATUSTEXT_FIELD_TEXT_LEN];
sprintf(buf, "[pm] failed loading param from storage ID: %u", req_read.param_index);
_mavlink->send_statustext_info(buf);
}
} }
} }
break; break;
@@ -207,11 +218,11 @@ MavlinkParametersManager::send(const hrt_abstime t)
} }
} }
void int
MavlinkParametersManager::send_param(param_t param) MavlinkParametersManager::send_param(param_t param)
{ {
if (param == PARAM_INVALID) { if (param == PARAM_INVALID) {
return; return 1;
} }
mavlink_param_value_t msg; mavlink_param_value_t msg;
@@ -221,7 +232,7 @@ MavlinkParametersManager::send_param(param_t param)
* space during transmission, copy param onto float val_buf * space during transmission, copy param onto float val_buf
*/ */
if (param_get(param, &msg.param_value) != OK) { if (param_get(param, &msg.param_value) != OK) {
return; return 2;
} }
msg.param_count = param_count_used(); msg.param_count = param_count_used();
@@ -248,4 +259,6 @@ MavlinkParametersManager::send_param(param_t param)
} }
_mavlink->send_message(MAVLINK_MSG_ID_PARAM_VALUE, &msg); _mavlink->send_message(MAVLINK_MSG_ID_PARAM_VALUE, &msg);
return 0;
} }
src/modules/mavlink/mavlink_parameters.h
+3 -2
View File
@@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
* *
* Copyright (c) 2012-2014 PX4 Development Team. All rights reserved. * Copyright (c) 2012-2015 PX4 Development Team. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -36,6 +36,7 @@
* Mavlink parameters manager definition. * Mavlink parameters manager definition.
* *
* @author Anton Babushkin <anton.babushkin@me.com> * @author Anton Babushkin <anton.babushkin@me.com>
* @author Lorenz Meier <lorenz@px4.io>
*/ */
#pragma once #pragma once
@@ -113,7 +114,7 @@ protected:
void send(const hrt_abstime t); void send(const hrt_abstime t);
void send_param(param_t param); int send_param(param_t param);
orb_advert_t _rc_param_map_pub; orb_advert_t _rc_param_map_pub;
struct rc_parameter_map_s _rc_param_map; struct rc_parameter_map_s _rc_param_map;