Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-23 22:58:10 +08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:PX4/Firmware into sdlog_buffering

Browse Source
This commit is contained in:
Lorenz Meier
2013-01-09 16:26:12 +01:00
parent b78a430424 d957f8e004
commit e1a6f1b910
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/commander/commander.c
+3
View File
@@ -1200,6 +1200,7 @@ int commander_thread_main(int argc, char *argv[])
/* mark all signals lost as long as they haven't been found */
current_status.rc_signal_lost = true;
current_status.offboard_control_signal_lost = true;
current_status.battery_warning = VEHICLE_BATTERY_WARNING_NONE;
/* advertise to ORB */
stat_pub = orb_advertise(ORB_ID(vehicle_status), &current_status);
@@ -1393,6 +1394,7 @@ int commander_thread_main(int argc, char *argv[])
if (low_voltage_counter > LOW_VOLTAGE_BATTERY_COUNTER_LIMIT) {
low_battery_voltage_actions_done = true;
current_status.battery_warning = VEHICLE_BATTERY_WARNING_WARNING;
mavlink_log_critical(mavlink_fd, "[commander] WARNING! LOW BATTERY!");
}
@@ -1403,6 +1405,7 @@ int commander_thread_main(int argc, char *argv[])
else if (battery_voltage_valid && (bat_remain < 0.1f /* XXX MAGIC NUMBER */) && (false == critical_battery_voltage_actions_done && true == low_battery_voltage_actions_done)) {
if (critical_voltage_counter > CRITICAL_VOLTAGE_BATTERY_COUNTER_LIMIT) {
critical_battery_voltage_actions_done = true;
current_status.battery_warning = VEHICLE_BATTERY_WARNING_ALERT;
mavlink_log_critical(mavlink_fd, "[commander] EMERGENCY! CRITICAL BATTERY!");
state_machine_emergency(stat_pub, &current_status, mavlink_fd);
}
apps/drivers/px4io/px4io.cpp
+2 -1
View File
@@ -388,7 +388,8 @@ PX4IO::task_main()
if (fds[1].revents & POLLIN) {
/* get controls */
orb_copy(ORB_ID_VEHICLE_ATTITUDE_CONTROLS, _t_actuators, &_controls);
orb_copy(_primary_pwm_device ? ORB_ID_VEHICLE_ATTITUDE_CONTROLS :
ORB_ID(actuator_controls_1), _t_actuators, &_controls);
/* scale controls to PWM (temporary measure) */
for (unsigned i = 0; i < _max_actuators; i++)
apps/mathlib/CMSIS/Makefile
+1 -1
View File
@@ -38,7 +38,7 @@
#
# Find sources
#
DSPLIB_SRCDIR = $(dir $(lastword $(MAKEFILE_LIST)))
DSPLIB_SRCDIR := $(dir $(lastword $(MAKEFILE_LIST)))
CSRCS := $(wildcard $(DSPLIB_SRCDIR)/DSP_Lib/Source/*/*.c)
INCLUDES += $(DSPLIB_SRCDIR)/Include \
apps/uORB/topics/vehicle_status.h
+8
View File
@@ -99,6 +99,13 @@ enum VEHICLE_ATTITUDE_MODE {
VEHICLE_ATTITUDE_MODE_ATTITUDE /**< tait-bryan attitude control mode */
};
enum VEHICLE_BATTERY_WARNING {
VEHICLE_BATTERY_WARNING_NONE = 0, /**< no battery low voltage warning active */
VEHICLE_BATTERY_WARNING_WARNING, /**< warning of low voltage 1. stage */
VEHICLE_BATTERY_WARNING_ALERT /**< aleting of low voltage 2. stage */
};
/**
* state machine / state of vehicle.
*
@@ -157,6 +164,7 @@ struct vehicle_status_s
float voltage_battery;
float current_battery;
float battery_remaining;
enum VEHICLE_BATTERY_WARNING battery_warning; /**< current battery warning mode, as defined by VEHICLE_BATTERY_WARNING enum */
uint16_t drop_rate_comm;
uint16_t errors_comm;
uint16_t errors_count1;