fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,596 Commits 852 Branches 161 Tags
Commit Graph

949 Commits

Author SHA1 Message Date
Lorenz Meier
e88bbe288d Merge branch 'warning_fixes_v3' into prearm_checks 2014-06-30 16:34:15 +02:00
Lorenz Meier
9dbc83cce1 Merged master into prearm_checks 2014-06-30 16:24:48 +02:00
Lorenz Meier
799f568ab4 commander: Minor checks / improvements to power enforce patch 2014-06-30 14:33:56 +02:00
Anton Babushkin
0a159e1a24 mavlink, commander: bugs fixed 2014-06-30 12:31:29 +02:00
Anton Babushkin
1a6b2b9c1e Merge branch 'master' into dataman_state_nav_rewrite 2014-06-30 12:31:06 +02:00
Lorenz Meier
3f6851b987 Re-send the RC config warnings once the GCS is connected, fixed compile warnings 2014-06-30 12:19:08 +02:00
Lorenz Meier
154f14e747 Merged master into power_enforce 2014-06-30 00:50:38 +02:00
Lorenz Meier
28a31708f9 Merged estimator fixes and mavlink rate config bits 2014-06-30 00:46:29 +02:00
Don Gagne
2448e2adbc More tab fixes 2014-06-29 13:55:55 -07:00
Don Gagne
d5b5dcef24 Fix bugs found through compiler warnings 2014-06-29 12:01:43 -07:00
Lorenz Meier
ecee13861c Merged master 2014-06-29 19:12:35 +02:00
Julian Oes
faebf17514 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 14:41:38 +02:00
Julian Oes
b8d07532a7 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 14:41:19 +02:00
Julian Oes
cc8f7f4c97 Merge branch 'master' into navigator_rewrite 
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/state_machine_helper.h
	src/modules/mavlink/mavlink_messages.cpp
 2014-06-27 14:39:36 +02:00
Julian Oes
332f03fa67 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 12:55:42 +02:00
Julian Oes
a122e88893 commander: hack to get velocity offboard control working 2014-06-27 12:54:39 +02:00
Julian Oes
5330ffe458 commander: detect if offboard control is lost and missing offboard states 2014-06-27 12:53:07 +02:00
Julian Oes
19fad94a34 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 11:02:47 +02:00
Lorenz Meier
0fe8ed509a Merge branch 'master' into power_enforce 2014-06-26 17:28:01 +02:00
Lorenz Meier
690edbd672 Remove duplicate code in the arming check 2014-06-26 12:14:49 +02:00
Lorenz Meier
547f71d791 Add mavlink_fd to all commander arm transitions to provide user feedback why the arming command failed 2014-06-26 12:09:54 +02:00
Lorenz Meier
1cd82fc89c Add mavlink_fd to all commander arm transitions to provide user feedback why the arming command failed 2014-06-26 12:07:28 +02:00
Anton Babushkin
bdf1b9274c commander: modes fallback and reject messages fixed 2014-06-25 17:56:11 +02:00
Lorenz Meier
f318ee2194 Remove debug output in commander spamming console 2014-06-22 18:15:15 +02:00
Anton Babushkin
164f19176e Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-21 14:26:40 +02:00
Julian Oes
4e08457afe Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboard 
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/state_machine_helper.cpp
	src/modules/mavlink/mavlink_receiver.cpp
	src/modules/mavlink/mavlink_receiver.h
	src/modules/uORB/topics/vehicle_status.h
 2014-06-20 18:18:39 +02:00
Julian Oes
62faa2ee51 commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) 2014-06-19 10:26:56 +02:00
Julian Oes
e24925c743 commander: added some failsafe logic 2014-06-18 19:01:41 +02:00
Anton Babushkin
55e5f747de commander: modes display fixes, don't activate failsafe while disarmed 2014-06-17 13:19:50 +02:00
t0ni0
6183390547 Commander attitude flag fix 2014-06-16 17:47:10 -04:00
Anton Babushkin
e0ed0625f8 commander: failsafe_state removed, replaced with bool failsafe, navigation state and failsafe determined directly from main state and conditions 2014-06-16 17:34:21 +02:00
Benjamin O'Connell-Armand
74ae18c245 Fixed rates flags 2014-06-14 18:46:18 -04:00
Anton Babushkin
5be741607c mavlink: mission manager moved to separate class and reworked 2014-06-14 23:57:29 +02:00
andre-nguyen
6cf890b46b indentation and fix commander flags. It's impossible to control position at the same time as attitude so we have to disable some things. My logic is that all the control flags for position control should be opposite of the attitude control mode. 2014-06-14 15:27:07 -04:00
Anton Babushkin
91b590ef58 Move MISSION_STATE read/write from mavlink to navigator and commander 2014-06-13 23:40:48 +02:00
Julian Oes
d48a8bc073 navigator: renamed the different RTL states 2014-06-12 19:09:18 +02:00
Julian Oes
94c4fc56aa navigator: audio messages about what is happening, RTL during mission not triggered but after mission 2014-06-06 23:08:11 +02:00
t0ni0
e12d3af503 Added support for offboard velocity control & fixed position control flags 2014-06-03 23:38:18 -04:00
Julian Oes
d1d03c34b9 Merge remote-tracking branch 'px4/master' into navigator_rewrite 
Conflicts:
	src/modules/navigator/navigator_main.cpp
 2014-06-03 16:04:39 +02:00
Benjamin O'Connell-Armand
1fc859b1b1 Added support for postion_control offboard messages in commander. 2014-06-02 23:11:31 -04:00
Thomas Gubler
480c41d835 do not read out home position in gcs (home position is still displayed) 2014-06-01 13:18:56 +02:00
Thomas Gubler
dc336a2ea4 Merge remote-tracking branch 'upstream/master' into geo 2014-05-30 16:09:44 +02:00
Julian Oes
c8903b1672 commander: modes and RC loss working now 2014-05-27 23:24:01 +02:00
Julian Oes
ed6c2a5168 commander and navigator: lot's of changes, failsafe handling in commander, navigator only for execution (WIP) 2014-05-27 21:56:32 +02:00
Julian Oes
063caba36b Merge branch 'master' into navigator_rewrite 
Conflicts:
	src/drivers/gps/gps.cpp
	src/drivers/gps/mtk.cpp
	src/modules/commander/commander.cpp
	src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
	src/modules/navigator/mission.cpp
	src/modules/navigator/mission.h
	src/modules/navigator/navigator_main.cpp
	src/modules/navigator/navigator_state.h
	src/modules/position_estimator_inav/position_estimator_inav_main.c
 2014-05-26 20:19:11 +02:00
Lorenz Meier
064329dd09 commander: put circuit breaker into effect 2014-05-25 20:34:32 +02:00
Lorenz Meier
c7bf00562d commander: Enforce (in presence of power sensing) that a) system is not purely servo rail powered and b) power rail voltage is higher than 4.5V on the main avionics rail 2014-05-25 08:22:54 +02:00
Lorenz Meier
a359a1b940 Fixed audio output to provide decent user feedback 2014-05-23 15:02:24 +02:00
Lorenz Meier
5f752cdb7c commander: Better audio indications on arming reject reasons 2014-05-23 13:41:48 +02:00
Thomas Gubler
05648d80d2 Merge remote-tracking branch 'upstream/master' into geo 
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
 2014-05-22 13:25:52 +02:00