From 972c8e47d2ffd3c435650dbaa05e0222ced4044b Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Mon, 15 Dec 2014 12:20:59 +0900 Subject: [PATCH] Notify: rename notify_types to notify_flags_type --- libraries/AP_Notify/AP_Notify.cpp | 2 +- libraries/AP_Notify/AP_Notify.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_Notify/AP_Notify.cpp b/libraries/AP_Notify/AP_Notify.cpp index 938c466b9e..2e83976f4a 100644 --- a/libraries/AP_Notify/AP_Notify.cpp +++ b/libraries/AP_Notify/AP_Notify.cpp @@ -17,7 +17,7 @@ #include // static flags, to allow for direct class update from device drivers -struct AP_Notify::notify_type AP_Notify::flags; +struct AP_Notify::notify_flags_type AP_Notify::flags; struct AP_Notify::notify_events_type AP_Notify::events; #if CONFIG_HAL_BOARD == HAL_BOARD_PX4 diff --git a/libraries/AP_Notify/AP_Notify.h b/libraries/AP_Notify/AP_Notify.h index 59ee00aa0e..f13a69164f 100644 --- a/libraries/AP_Notify/AP_Notify.h +++ b/libraries/AP_Notify/AP_Notify.h @@ -48,8 +48,8 @@ class AP_Notify { public: - /// notify_type - bitmask of notification types - struct notify_type { + /// notify_flags_type - bitmask of notification flags + struct notify_flags_type { uint16_t initialising : 1; // 1 if initialising and copter should not be moved uint16_t gps_status : 3; // 0 = no gps, 1 = no lock, 2 = 2d lock, 3 = 3d lock, 4 = dgps lock, 5 = rtk lock uint16_t gps_glitching : 1; // 1 if gps position is not good @@ -84,7 +84,7 @@ public: // the notify flags are static to allow direct class access // without declaring the object - static struct notify_type flags; + static struct notify_flags_type flags; static struct notify_events_type events; // initialisation