From 682fc759f10cee813d8dbdd50bade6cbaaefdd4f Mon Sep 17 00:00:00 2001 From: Randy Mackay <rmackay9@yahoo.com> Date: Fri, 20 Jan 2017 14:51:04 +0900 Subject: [PATCH] AP_Notify: minor formatting and comment changes No functional change --- libraries/AP_Notify/AP_Notify.h | 10 ++++++---- libraries/AP_Notify/Display.cpp | 3 +-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libraries/AP_Notify/AP_Notify.h b/libraries/AP_Notify/AP_Notify.h index bb03f12edb..bb2d13ae13 100644 --- a/libraries/AP_Notify/AP_Notify.h +++ b/libraries/AP_Notify/AP_Notify.h @@ -117,8 +117,6 @@ public: // handle a PLAY_TUNE message static void handle_play_tune(mavlink_message_t* msg); - - static const struct AP_Param::GroupInfo var_info[]; bool buzzer_enabled() const { return _buzzer_enable; } @@ -126,13 +124,17 @@ public: void send_text(const char *str); const char* get_text() const { return _send_text; } -private: - static NotifyDevice* _devices[]; + static const struct AP_Param::GroupInfo var_info[]; +private: + + // parameters 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]; + + static NotifyDevice* _devices[]; }; diff --git a/libraries/AP_Notify/Display.cpp b/libraries/AP_Notify/Display.cpp index 028a5420e8..be0985c89d 100644 --- a/libraries/AP_Notify/Display.cpp +++ b/libraries/AP_Notify/Display.cpp @@ -394,17 +394,16 @@ bool Display::init(void) void Display::update() { - static uint8_t timer = 0; // return immediately if not enabled if (!_healthy) { return; } // max update frequency 2Hz + static uint8_t timer = 0; if (timer++ < 25) { return; } - timer = 0; if (AP_Notify::flags.armed) {