From 872e6769b08c1e1c3886ba9110dbd01db185db47 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Thu, 5 Mar 2015 17:17:19 +0900 Subject: [PATCH] Notify: change firmware_update event to flag --- libraries/AP_Notify/AP_Notify.h | 2 +- libraries/AP_Notify/OreoLED_PX4.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Notify/AP_Notify.h b/libraries/AP_Notify/AP_Notify.h index 1088dd9271..0e3d731061 100644 --- a/libraries/AP_Notify/AP_Notify.h +++ b/libraries/AP_Notify/AP_Notify.h @@ -53,6 +53,7 @@ public: uint32_t parachute_release : 1; // 1 if parachute is being released uint32_t ekf_bad : 1; // 1 if ekf is reporting problems uint32_t autopilot_mode : 1; // 1 if vehicle is in an autopilot flight mode (only used by OreoLEDs) + uint32_t firmware_update : 1; // 1 just before vehicle firmware is updated uint32_t compass_cal_running: 1; // 1 if a compass calibration is running // additional flags @@ -72,7 +73,6 @@ public: uint16_t autotune_next_axis : 1; // 1 when autotune has completed one axis and is moving onto the next uint16_t mission_complete : 1; // 1 when the mission has completed successfully uint16_t waypoint_complete : 1; // 1 as vehicle completes a waypoint - uint16_t firmware_update : 1; // 1 just before vehicle firmware is updated uint16_t initiated_compass_cal : 1; // 1 when user input to begin compass cal was accepted uint16_t compass_cal_saved : 1; // 1 when compass calibration was just saved uint16_t compass_cal_failed : 1; // 1 when compass calibration has just failed diff --git a/libraries/AP_Notify/OreoLED_PX4.cpp b/libraries/AP_Notify/OreoLED_PX4.cpp index 90d65bf543..415a76408c 100644 --- a/libraries/AP_Notify/OreoLED_PX4.cpp +++ b/libraries/AP_Notify/OreoLED_PX4.cpp @@ -89,7 +89,7 @@ void OreoLED_PX4::update() } // handle firmware update event - if (AP_Notify::events.firmware_update) { + if (AP_Notify::flags.firmware_update) { set_macro(OREOLED_INSTANCE_ALL, OREOLED_PARAM_MACRO_COLOUR_CYCLE); return; }