From d12e0d6a82ee4e3b2bc51fb6e41cfa79865f4add Mon Sep 17 00:00:00 2001
From: Randy Mackay <rmackay9@yahoo.com>
Date: Fri, 20 Jan 2017 14:50:07 +0900
Subject: [PATCH] AP_Notify: Display send_text made not static

---
 libraries/AP_Notify/AP_Notify.cpp | 1 -
 libraries/AP_Notify/AP_Notify.h   | 7 ++++---
 libraries/AP_Notify/Display.cpp   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/AP_Notify/AP_Notify.cpp b/libraries/AP_Notify/AP_Notify.cpp
index 7e928fc1bf..5156c3162f 100644
--- a/libraries/AP_Notify/AP_Notify.cpp
+++ b/libraries/AP_Notify/AP_Notify.cpp
@@ -77,7 +77,6 @@ AP_Notify::AP_Notify()
 // static flags, to allow for direct class update from device drivers
 struct AP_Notify::notify_flags_and_values_type AP_Notify::flags;
 struct AP_Notify::notify_events_type AP_Notify::events;
-char AP_Notify::_send_text[NOTIFY_TEXT_BUFFER_SIZE] {};
 
 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
     AP_BoardLED boardled;
diff --git a/libraries/AP_Notify/AP_Notify.h b/libraries/AP_Notify/AP_Notify.h
index edc12a233b..bb03f12edb 100644
--- a/libraries/AP_Notify/AP_Notify.h
+++ b/libraries/AP_Notify/AP_Notify.h
@@ -122,16 +122,17 @@ public:
 
     bool buzzer_enabled() const { return _buzzer_enable; }
 
-    static void send_text(const char *str);
-    static char* get_text() { return _send_text; }
+    // send text to display
+    void send_text(const char *str);
+    const char* get_text() const { return _send_text; }
 
 private:
     static NotifyDevice* _devices[];
 
-    static char _send_text[NOTIFY_TEXT_BUFFER_SIZE];
     AP_Int8 _rgb_led_brightness;
     AP_Int8 _rgb_led_override;
     AP_Int8 _buzzer_enable;
     AP_Int8 _display_type;
 
+    char _send_text[NOTIFY_TEXT_BUFFER_SIZE];
 };
diff --git a/libraries/AP_Notify/Display.cpp b/libraries/AP_Notify/Display.cpp
index 0b453c9588..028a5420e8 100644
--- a/libraries/AP_Notify/Display.cpp
+++ b/libraries/AP_Notify/Display.cpp
@@ -558,7 +558,7 @@ void Display::update_text(uint8_t r)
     char msg [DISPLAY_MESSAGE_SIZE];
     char txt [NOTIFY_TEXT_BUFFER_SIZE];
 
-    snprintf(txt, NOTIFY_TEXT_BUFFER_SIZE, "%s", AP_Notify::get_text());
+    snprintf(txt, NOTIFY_TEXT_BUFFER_SIZE, "%s", pNotify->get_text());
     _mstartpos++;
     for (uint8_t i = 0; i < sizeof(msg); i++) {
         if (txt[i + _mstartpos - 1] != 0) {