From aa91c2c1f2f4854ef453fad59c0dd683e3e10b07 Mon Sep 17 00:00:00 2001
From: "tridge60@gmail.com"
 <tridge60@gmail.com@f9c3cf11-9bcb-44bc-f272-b75c42450872>
Date: Mon, 21 Mar 2011 07:26:59 +0000
Subject: [PATCH] adapt send_text() for typesafe PSTR()

git-svn-id: https://arducopter.googlecode.com/svn/trunk@1799 f9c3cf11-9bcb-44bc-f272-b75c42450872
---
 ArduCopterMega/GCS.h           | 4 ++--
 ArduCopterMega/GCS_Mavlink.pde | 4 ++--
 ArduCopterMega/HIL.h           | 4 ++--
 ArduCopterMega/HIL_Xplane.pde  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ArduCopterMega/GCS.h b/ArduCopterMega/GCS.h
index 4fcdb75bab..8276f41fe4 100644
--- a/ArduCopterMega/GCS.h
+++ b/ArduCopterMega/GCS.h
@@ -70,7 +70,7 @@ public:
 	/// @param	severity	A value describing the importance of the message.
 	/// @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.
 	///
@@ -140,7 +140,7 @@ public:
 	void	init(BetterStream *port);
 	void	send_message(uint8_t id, uint32_t param = 0);
 	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    data_stream_send(uint16_t freqMin, uint16_t freqMax);
 private:
diff --git a/ArduCopterMega/GCS_Mavlink.pde b/ArduCopterMega/GCS_Mavlink.pde
index f03106e033..708fcbb4fd 100644
--- a/ArduCopterMega/GCS_Mavlink.pde
+++ b/ArduCopterMega/GCS_Mavlink.pde
@@ -117,12 +117,12 @@ GCS_MAVLINK::send_text(uint8_t severity, const char *str)
 }
 
 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;
 	uint8_t 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;
     mavlink_send_text(chan, severity, (const char *)m.text);
diff --git a/ArduCopterMega/HIL.h b/ArduCopterMega/HIL.h
index d04068ade0..8a10a82fb5 100644
--- a/ArduCopterMega/HIL.h
+++ b/ArduCopterMega/HIL.h
@@ -71,7 +71,7 @@ public:
 	/// @param	severity	A value describing the importance of the message.
 	/// @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.
 	///
@@ -114,7 +114,7 @@ public:
 	void	init(BetterStream *port);
 	void	send_message(uint8_t id, uint32_t param = 0);
 	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);
 private:
 	void output_HIL();
diff --git a/ArduCopterMega/HIL_Xplane.pde b/ArduCopterMega/HIL_Xplane.pde
index 2940637c17..eeb8d0b4b0 100644
--- a/ArduCopterMega/HIL_Xplane.pde
+++ b/ArduCopterMega/HIL_Xplane.pde
@@ -119,7 +119,7 @@ HIL_XPLANE::send_text(uint8_t severity, const char *str)
 }
 
 void
-HIL_XPLANE::send_text_P(uint8_t severity, const char *str)
+HIL_XPLANE::send_text(uint8_t severity, const prog_char_t *str)
 {
 }