Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adapt send_text() for typesafe PSTR() 

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1799 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
tridge60@gmail.com 2011-03-21 07:26:59 +00:00
parent 776b9b6f7a
commit aa91c2c1f2
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopterMega/GCS.h
View File

@ -70,7 +70,7 @@ public:
/// @param severity A value describing the importance of the message. /// @param severity A value describing the importance of the message.
/// @param str The text to be sent. /// @param str The text to be sent.
/// ///
void send_text_P(uint8_t severity, const char *str) {} void send_text_P(uint8_t severity, const prog_char_t *str) {}
/// Send acknowledgement for a message. /// Send acknowledgement for a message.
/// ///
@ -140,7 +140,7 @@ public:
void init(BetterStream *port); void init(BetterStream *port);
void send_message(uint8_t id, uint32_t param = 0); void send_message(uint8_t id, uint32_t param = 0);
void send_text(uint8_t severity, const char *str); void send_text(uint8_t severity, const char *str);
void send_text_P(uint8_t severity, const char *str); void send_text_P(uint8_t severity, const prog_char_t *str);
void acknowledge(uint8_t id, uint8_t sum1, uint8_t sum2); void acknowledge(uint8_t id, uint8_t sum1, uint8_t sum2);
void data_stream_send(uint16_t freqMin, uint16_t freqMax); void data_stream_send(uint16_t freqMin, uint16_t freqMax);
private: private:

4
ArduCopterMega/GCS_Mavlink.pde
View File

@ -117,12 +117,12 @@ GCS_MAVLINK::send_text(uint8_t severity, const char *str)
} }
void void
GCS_MAVLINK::send_text_P(uint8_t severity, const char *str) GCS_MAVLINK::send_text_P(uint8_t severity, const prog_char_t *str)
{ {
mavlink_statustext_t m; mavlink_statustext_t m;
uint8_t i; uint8_t i;
for (i=0; i<sizeof(m.text); i++) { for (i=0; i<sizeof(m.text); i++) {
m.text[i] = pgm_read_byte(str++); m.text[i] = pgm_read_byte((const prog_char *)str++);
} }
if (i < sizeof(m.text)) m.text[i] = 0; if (i < sizeof(m.text)) m.text[i] = 0;
mavlink_send_text(chan, severity, (const char *)m.text); mavlink_send_text(chan, severity, (const char *)m.text);

4
ArduCopterMega/HIL.h
View File

@ -71,7 +71,7 @@ public:
/// @param severity A value describing the importance of the message. /// @param severity A value describing the importance of the message.
/// @param str The text to be sent. /// @param str The text to be sent.
/// ///
void send_text_P(uint8_t severity, const char *str) {} void send_text_P(uint8_t severity, const prog_char_t *str) {}
/// Send acknowledgement for a message. /// Send acknowledgement for a message.
/// ///
@ -114,7 +114,7 @@ public:
void init(BetterStream *port); void init(BetterStream *port);
void send_message(uint8_t id, uint32_t param = 0); void send_message(uint8_t id, uint32_t param = 0);
void send_text(uint8_t severity, const char *str); void send_text(uint8_t severity, const char *str);
void send_text_P(uint8_t severity, const char *str); void send_text_P(uint8_t severity, const prog_char_t *str);
void acknowledge(uint8_t id, uint8_t sum1, uint8_t sum2); void acknowledge(uint8_t id, uint8_t sum1, uint8_t sum2);
private: private:
void output_HIL(); void output_HIL();

2
ArduCopterMega/HIL_Xplane.pde
View File

@ -119,7 +119,7 @@ HIL_XPLANE::send_text(uint8_t severity, const char *str)
} }
void void
HIL_XPLANE::send_text_P(uint8_t severity, const char *str) HIL_XPLANE::send_text(uint8_t severity, const prog_char_t *str)
{ {
} }