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

GCS_MAVLink: remove send_text_P() in favor of send_text()

Browse Source
This commit is contained in:
Lucas De Marchi 2015-10-25 15:11:28 -02:00 committed by Randy Mackay
parent 89fc4f4b62
commit af88ebf477
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/GCS_MAVLink/GCS.h
View File

@ -87,7 +87,6 @@ public:
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(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();

21
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -393,7 +393,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(MAV_SEVERITY_WARNING,"flight plan update rejected");
send_text(MAV_SEVERITY_WARNING,"flight plan update rejected");
return;
}
@ -630,23 +630,6 @@ GCS_MAVLINK::send_text(MAV_SEVERITY severity, const char *str)
}
}
void
GCS_MAVLINK::send_text_P(MAV_SEVERITY severity, const prog_char_t *str)
{
mavlink_statustext_t m;
uint8_t i;
memset(m.text, 0, sizeof(m.text));
for (i=0; i<sizeof(m.text); i++) {
m.text[i] = pgm_read_byte((const prog_char *)(str++));
if (m.text[i] == '\0') {
break;
}
}
if (i < sizeof(m.text)) m.text[i] = 0;
send_text(severity, (const char *)m.text);
}
void GCS_MAVLINK::handle_radio_status(mavlink_message_t *msg, DataFlash_Class &dataflash, bool log_radio)
{
mavlink_radio_t packet;
@ -767,7 +750,7 @@ bool GCS_MAVLINK::handle_mission_item(mavlink_message_t *msg, AP_Mission &missio
msg->compid,
MAV_MISSION_ACCEPTED);
send_text_P(MAV_SEVERITY_WARNING,"flight plan received");
send_text(MAV_SEVERITY_WARNING,"flight plan received");
waypoint_receiving = false;
mission_is_complete = true;
// XXX ignores waypoint radius for individual waypoints, can