aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCS_MAVLink: update severities and remove old enum

Browse Source
This commit is contained in:
squilter 2015-08-25 15:08:17 -07:00 committed by Andrew Tridgell
parent 4a51dcc14d
commit 426dab5078
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/GCS_MAVLink/GCS.h
View File

@ -84,8 +84,8 @@ public:
void init(AP_HAL::UARTDriver *port, mavlink_channel_t mav_chan);
void setup_uart(const AP_SerialManager& serial_manager, AP_SerialManager::SerialProtocol protocol, uint8_t instance);
void send_message(enum ap_message id);
void send_text(uint8_t severity, const char *str);
void send_text_P(uint8_t severity, const prog_char_t *str);
void send_text(MAV_SEVERITY severity, const char *str);
void send_text_P(MAV_SEVERITY severity, const prog_char_t *str);
void data_stream_send(void);
void queued_param_send();
void queued_waypoint_send();

12
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -380,7 +380,7 @@ void GCS_MAVLINK::handle_mission_write_partial_list(AP_Mission &mission, mavlink
if ((unsigned)packet.start_index > mission.num_commands() ||
(unsigned)packet.end_index > mission.num_commands() ||
packet.end_index < packet.start_index) {
send_text_P(SEVERITY_LOW,PSTR("flight plan update rejected"));
send_text_P(MAV_SEVERITY_WARNING,PSTR("flight plan update rejected"));
return;
}
@ -501,7 +501,7 @@ void GCS_MAVLINK::handle_param_request_list(mavlink_message_t *msg)
// send system ID if we can
char sysid[40];
if (hal.util->get_system_id(sysid)) {
send_text(SEVERITY_LOW, sysid);
send_text(MAV_SEVERITY_WARNING, sysid);
}
#endif
@ -601,7 +601,7 @@ void GCS_MAVLINK::handle_param_set(mavlink_message_t *msg, DataFlash_Class *Data
void
GCS_MAVLINK::send_text(uint8_t severity, const char *str)
GCS_MAVLINK::send_text(MAV_SEVERITY severity, const char *str)
{
if (severity < MAV_SEVERITY_WARNING &&
comm_get_txspace(chan) >=
@ -618,7 +618,7 @@ GCS_MAVLINK::send_text(uint8_t severity, const char *str)
}
void
GCS_MAVLINK::send_text_P(uint8_t severity, const prog_char_t *str)
GCS_MAVLINK::send_text_P(MAV_SEVERITY severity, const prog_char_t *str)
{
mavlink_statustext_t m;
uint8_t i;
@ -754,7 +754,7 @@ bool GCS_MAVLINK::handle_mission_item(mavlink_message_t *msg, AP_Mission &missio
msg->compid,
MAV_MISSION_ACCEPTED);
send_text_P(SEVERITY_LOW,PSTR("flight plan received"));
send_text_P(MAV_SEVERITY_WARNING,PSTR("flight plan received"));
waypoint_receiving = false;
mission_is_complete = true;
// XXX ignores waypoint radius for individual waypoints, can
@ -1178,7 +1178,7 @@ void GCS_MAVLINK::send_statustext_all(const prog_char_t *msg)
char msg2[50];
strncpy_P(msg2, msg, sizeof(msg2));
mavlink_msg_statustext_send(chan,
SEVERITY_HIGH,
MAV_SEVERITY_CRITICAL,
msg2);
}
}

9
libraries/GCS_MAVLink/GCS_MAVLink.h
View File

@ -116,15 +116,6 @@ uint8_t mav_var_type(enum ap_var_type t);
// return CRC byte for a mavlink message ID
uint8_t mavlink_get_message_crc(uint8_t msgid);
// severity levels used in STATUSTEXT messages
enum gcs_severity {
SEVERITY_LOW=1,
SEVERITY_MEDIUM,
SEVERITY_HIGH,
SEVERITY_CRITICAL,
SEVERITY_USER_RESPONSE
};
#pragma GCC diagnostic pop
#endif // GCS_MAVLink_h