fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 02:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Made low/critical warnings consisting

Browse Source
This commit is contained in:
Julian Oes
2013-08-29 16:41:59 +02:00
parent 94d678098c
commit 55cfa5152c
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/blinkm/blinkm.cpp
+2 -2
View File
@@ -541,7 +541,7 @@ BlinkM::led()
printf("<blinkm> cells found:%d\n", num_of_cells); printf("<blinkm> cells found:%d\n", num_of_cells);
} else { } else {
if(vehicle_status_raw.battery_warning == VEHICLE_BATTERY_WARNING_WARNING) { if(vehicle_status_raw.battery_warning == VEHICLE_BATTERY_WARNING_LOW) {
/* LED Pattern for battery low warning */ /* LED Pattern for battery low warning */
led_color_1 = LED_YELLOW; led_color_1 = LED_YELLOW;
led_color_2 = LED_YELLOW; led_color_2 = LED_YELLOW;
@@ -553,7 +553,7 @@ BlinkM::led()
led_color_8 = LED_YELLOW; led_color_8 = LED_YELLOW;
led_blink = LED_BLINK; led_blink = LED_BLINK;
} else if(vehicle_status_raw.battery_warning == VEHICLE_BATTERY_WARNING_ALERT) { } else if(vehicle_status_raw.battery_warning == VEHICLE_BATTERY_WARNING_CRITICAL) {
/* LED Pattern for battery critical alerting */ /* LED Pattern for battery critical alerting */
led_color_1 = LED_RED; led_color_1 = LED_RED;
led_color_2 = LED_RED; led_color_2 = LED_RED;
src/modules/commander/commander.cpp
+8 -8
View File
@@ -890,7 +890,7 @@ int commander_thread_main(int argc, char *argv[])
if (low_voltage_counter > LOW_VOLTAGE_BATTERY_COUNTER_LIMIT) { if (low_voltage_counter > LOW_VOLTAGE_BATTERY_COUNTER_LIMIT) {
low_battery_voltage_actions_done = true; low_battery_voltage_actions_done = true;
mavlink_log_critical(mavlink_fd, "[cmd] WARNING: LOW BATTERY"); mavlink_log_critical(mavlink_fd, "[cmd] WARNING: LOW BATTERY");
status.battery_warning = VEHICLE_BATTERY_WARNING_WARNING; status.battery_warning = VEHICLE_BATTERY_WARNING_LOW;
status_changed = true; status_changed = true;
battery_tune_played = false; battery_tune_played = false;
} }
@@ -902,7 +902,7 @@ int commander_thread_main(int argc, char *argv[])
if (critical_voltage_counter > CRITICAL_VOLTAGE_BATTERY_COUNTER_LIMIT) { if (critical_voltage_counter > CRITICAL_VOLTAGE_BATTERY_COUNTER_LIMIT) {
critical_battery_voltage_actions_done = true; critical_battery_voltage_actions_done = true;
mavlink_log_critical(mavlink_fd, "[cmd] EMERGENCY: CRITICAL BATTERY"); mavlink_log_critical(mavlink_fd, "[cmd] EMERGENCY: CRITICAL BATTERY");
status.battery_warning = VEHICLE_BATTERY_WARNING_ALERT; status.battery_warning = VEHICLE_BATTERY_WARNING_CRITICAL;
battery_tune_played = false; battery_tune_played = false;
if (armed.armed) { if (armed.armed) {
@@ -1160,12 +1160,12 @@ int commander_thread_main(int argc, char *argv[])
if (tune_arm() == OK) if (tune_arm() == OK)
arm_tune_played = true; arm_tune_played = true;
} else if (status.battery_warning == VEHICLE_BATTERY_WARNING_WARNING) { } else if (status.battery_warning == VEHICLE_BATTERY_WARNING_LOW) {
/* play tune on battery warning */ /* play tune on battery warning */
if (tune_low_bat() == OK) if (tune_low_bat() == OK)
battery_tune_played = true; battery_tune_played = true;
} else if (status.battery_warning == VEHICLE_BATTERY_WARNING_ALERT) { } else if (status.battery_warning == VEHICLE_BATTERY_WARNING_CRITICAL) {
/* play tune on battery critical */ /* play tune on battery critical */
if (tune_critical_bat() == OK) if (tune_critical_bat() == OK)
battery_tune_played = true; battery_tune_played = true;
@@ -1258,10 +1258,10 @@ toggle_status_leds(vehicle_status_s *status, actuator_armed_s *armed, bool chang
if (armed->armed) { if (armed->armed) {
/* armed, solid */ /* armed, solid */
if (status->battery_warning == VEHICLE_BATTERY_WARNING_WARNING) { if (status->battery_warning == VEHICLE_BATTERY_WARNING_LOW) {
pattern.color[0] = (on_usb_power) ? RGBLED_COLOR_DIM_AMBER : RGBLED_COLOR_AMBER; pattern.color[0] = (on_usb_power) ? RGBLED_COLOR_DIM_AMBER : RGBLED_COLOR_AMBER;
} else if (status->battery_warning == VEHICLE_BATTERY_WARNING_ALERT) { } else if (status->battery_warning == VEHICLE_BATTERY_WARNING_CRITICAL) {
pattern.color[0] = (on_usb_power) ? RGBLED_COLOR_DIM_RED : RGBLED_COLOR_RED; pattern.color[0] = (on_usb_power) ? RGBLED_COLOR_DIM_RED : RGBLED_COLOR_RED;
} else { } else {
@@ -1272,10 +1272,10 @@ toggle_status_leds(vehicle_status_s *status, actuator_armed_s *armed, bool chang
} else if (armed->ready_to_arm) { } else if (armed->ready_to_arm) {
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (status->battery_warning == VEHICLE_BATTERY_WARNING_WARNING) { if (status->battery_warning == VEHICLE_BATTERY_WARNING_LOW) {
pattern.color[i * 2] = (on_usb_power) ? RGBLED_COLOR_DIM_AMBER : RGBLED_COLOR_AMBER; pattern.color[i * 2] = (on_usb_power) ? RGBLED_COLOR_DIM_AMBER : RGBLED_COLOR_AMBER;
} else if (status->battery_warning == VEHICLE_BATTERY_WARNING_ALERT) { } else if (status->battery_warning == VEHICLE_BATTERY_WARNING_CRITICAL) {
pattern.color[i * 2] = (on_usb_power) ? RGBLED_COLOR_DIM_RED : RGBLED_COLOR_RED; pattern.color[i * 2] = (on_usb_power) ? RGBLED_COLOR_DIM_RED : RGBLED_COLOR_RED;
} else { } else {
src/modules/uORB/topics/vehicle_status.h
+3 -3
View File
@@ -153,9 +153,9 @@ enum VEHICLE_TYPE {
}; };
enum VEHICLE_BATTERY_WARNING { enum VEHICLE_BATTERY_WARNING {
VEHICLE_BATTERY_WARNING_NONE = 0, /**< no battery low voltage warning active */ VEHICLE_BATTERY_WARNING_NONE = 0, /**< no battery low voltage warning active */
VEHICLE_BATTERY_WARNING_WARNING, /**< warning of low voltage 1. stage */ VEHICLE_BATTERY_WARNING_LOW, /**< warning of low voltage */
VEHICLE_BATTERY_WARNING_ALERT /**< alerting of low voltage 2. stage */ VEHICLE_BATTERY_WARNING_CRITICAL /**< alerting of critical voltage */
}; };
/** /**