Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-30 20:48:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Notify: Display send_text made not static

Browse Source
This commit is contained in:
Randy Mackay 2017-01-20 14:50:07 +09:00 committed by Lucas De Marchi
parent 07c08c09a3
commit d12e0d6a82
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/AP_Notify/AP_Notify.cpp
View File

@ -77,7 +77,6 @@ AP_Notify::AP_Notify()
// static flags, to allow for direct class update from device drivers // 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_flags_and_values_type AP_Notify::flags;
struct AP_Notify::notify_events_type AP_Notify::events; 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 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4
AP_BoardLED boardled; AP_BoardLED boardled;

7
libraries/AP_Notify/AP_Notify.h
View File

@ -122,16 +122,17 @@ public:
bool buzzer_enabled() const { return _buzzer_enable; } bool buzzer_enabled() const { return _buzzer_enable; }
static void send_text(const char *str); // send text to display
static char* get_text() { return _send_text; } void send_text(const char *str);
const char* get_text() const { return _send_text; }
private: private:
static NotifyDevice* _devices[]; static NotifyDevice* _devices[];
static char _send_text[NOTIFY_TEXT_BUFFER_SIZE];
AP_Int8 _rgb_led_brightness; AP_Int8 _rgb_led_brightness;
AP_Int8 _rgb_led_override; AP_Int8 _rgb_led_override;
AP_Int8 _buzzer_enable; AP_Int8 _buzzer_enable;
AP_Int8 _display_type; AP_Int8 _display_type;
char _send_text[NOTIFY_TEXT_BUFFER_SIZE];
}; };

2
libraries/AP_Notify/Display.cpp
View File

@ -558,7 +558,7 @@ void Display::update_text(uint8_t r)
char msg [DISPLAY_MESSAGE_SIZE]; char msg [DISPLAY_MESSAGE_SIZE];
char txt [NOTIFY_TEXT_BUFFER_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++; _mstartpos++;
for (uint8_t i = 0; i < sizeof(msg); i++) { for (uint8_t i = 0; i < sizeof(msg); i++) {
if (txt[i + _mstartpos - 1] != 0) { if (txt[i + _mstartpos - 1] != 0) {