949 Commits

Author SHA1 Message Date
Julian Oes
54b9698d65 circuit_breakers: added param to disable airspeed check 2014-07-26 17:48:45 +02:00
Thomas Gubler
a35814d15b dl loss: correct timeout, add hysteresis also for regain 2014-07-24 08:57:58 +02:00
Thomas Gubler
24f380137e add method to block fallback to mission
failsafe navigation modes can use a flag in mission_result to tell the
commander to not switch back to mission
2014-07-23 22:58:19 +02:00
Thomas Gubler
825b84fa3b Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
	src/modules/mavlink/mavlink_main.cpp
2014-07-23 09:31:28 +02:00
Thomas Gubler
ed19faf428 Merge remote-tracking branch 'upstream/master' into obcfailsafe 2014-07-22 21:20:04 +02:00
Thomas Gubler
86b9e367a6 introduce data link lost counter 2014-07-20 18:23:41 +02:00
Thomas Gubler
dcf114aa65 data link loss timeout as param 2014-07-20 17:53:04 +02:00
Thomas Gubler
74417f1439 Merge remote-tracking branch 'upstream/master' into obcfailsafe 2014-07-20 17:40:38 +02:00
Lorenz Meier
e21cb64553 Merge branch 'master' of github.com:PX4/Firmware into battload 2014-07-20 16:21:59 +02:00
Lorenz Meier
5fb2a92e77 commander: Do not confuse developers with wrong comments, do not confuse users with not at all helpful "general error" messages. 2014-07-20 14:28:05 +02:00
Lorenz Meier
5d2489880c Fix low voltage warning threshold to 9%, not 90% 2014-07-19 21:14:14 +02:00
Thomas Gubler
7baa337d9b flight termination on geofence violation 2014-07-19 19:25:53 +02:00
Thomas Gubler
0b743a9f5c parse flighttermination command 2014-07-19 14:39:41 +02:00
Lorenz Meier
3db78a4ab3 commander: Warn at 18 and 9% battery remaining instead of 25 and 10% to not trigger the warning too early (at 50%) as it was before 2014-07-19 14:34:19 +02:00
Lorenz Meier
3a0fc36c67 Consider the throttle load for battery voltage calculation 2014-07-19 14:12:33 +02:00
Thomas Gubler
8bb1f9a4bf Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 2014-07-17 09:13:00 +02:00
Thomas Gubler
f460870738 support force setpoints 2014-07-17 09:12:45 +02:00
Anton Babushkin
698fcb6b86 commander: only warn about lost link if link was working before 2014-07-16 14:22:48 +02:00
Thomas Gubler
3c8927c423 once offboard is set by mavlink command ignore RC mode 2014-07-16 09:39:40 +02:00
Thomas Gubler
747eda92b9 commander: handle VEHICLE_CMD_NAV_GUIDED_ENABLE 2014-07-14 11:19:06 +02:00
Thomas Gubler
574b7fc854 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 2014-07-14 09:56:14 +02:00
Lorenz Meier
66d5bc20c0 commander RC handling: Fix -Wshadow warnings. 2014-07-13 11:45:02 +02:00
Lorenz Meier
f2b30be92a commander status leds: Fix -Wshadow warning. 2014-07-13 11:44:27 +02:00
Lorenz Meier
76f7960d77 Mavlink text feedback: Remove now unneeded audio tag for critical messages, make overall printing more efficient. Remove buffers where no buffers are needed. 2014-07-13 11:43:56 +02:00
Lorenz Meier
3ec9ffa661 Buzzer and led: Fix -Wshadow warnings. 2014-07-13 11:42:02 +02:00
Lorenz Meier
ea11bc6c4b Command handling: Fix up local variable usage and status prints. 2014-07-13 11:41:39 +02:00
Lorenz Meier
48a614c2cb Merge branch 'master' of github.com:PX4/Firmware into dataman_state_nav_rewrite 2014-07-11 16:59:01 +02:00
Lorenz Meier
79c5d434bd Commander: More hotfixes to prearm check routine 2014-07-11 15:10:11 +02:00
Lorenz Meier
a82d4fbb11 Hotfix: fix typo 2014-07-11 14:55:46 +02:00
Lorenz Meier
b97c867420 Add a check command and fix error reporting 2014-07-11 14:51:13 +02:00
Anton Babushkin
fc1669b096 Merge branch master into dataman_state_nav_rewrite 2014-07-10 14:11:25 +02:00
Thomas Gubler
0d7ae9276e Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
	src/modules/navigator/offboard.cpp
2014-07-08 11:06:47 +02:00
Julian Oes
407eafbdbb Merge branch 'master' into offboard2_merge
Conflicts:
	src/modules/navigator/navigator.h
	src/modules/navigator/navigator_main.cpp
2014-07-07 15:11:12 +02:00
Anton Babushkin
9a69c7ba0e Merge branch 'master' into dataman_nav_drton 2014-07-07 15:09:16 +02:00
Julian Oes
79cbf15d26 Merge branch 'master' into offboard2_merge
Conflicts:
	src/modules/commander/commander.cpp
2014-07-07 14:49:58 +02:00
Lorenz Meier
be73ad0bdb Merge pull request #1119 from PX4/navigator_rewrite_drton
Navigator rewrite - DrTon
2014-07-07 14:30:38 +02:00
Thomas Gubler
58adea9469 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
	src/modules/commander/commander.cpp
2014-07-07 08:51:52 +02:00
Don Gagne
2a79689224 Fix unused variable warnings 2014-07-06 16:51:06 -07:00
Lorenz Meier
d67089b23f Merge pull request #1133 from PX4/datalink_fix
Telemetry status: use separate topic for each link
2014-07-06 23:12:33 +02:00
Anton Babushkin
06f08ad04d commander: require home position for MISSION, fallback to LOITER 2014-07-06 21:37:26 +02:00
Anton Babushkin
bd5d3ebf70 telemetry_statur: use 4 separate topics 2014-07-06 16:08:37 +02:00
Don Gagne
b9299e68d4 Compiler warning fixes 2014-07-05 13:35:12 -07:00
Antonio Sanniravong
d4eae37e47 Commander: Only consider latest active data link heartbeat for timeout. 2014-07-04 21:00:05 -04:00
Anton Babushkin
39dab45ac5 Merge branch 'master' into dataman_state_nav_rewrite 2014-07-04 12:22:55 +02:00
Thomas Gubler
839710daf8 Update offboard control uorb topic
Work towards supporting the new external setpoint mavlink messages
2014-07-03 14:46:25 +02:00
Julian Oes
73d6121a9d Merge branch 'master' into offboard2_merge
Conflicts:
	src/modules/uORB/topics/rc_channels.h
2014-07-02 15:15:26 +02:00
Julian Oes
fdceb8b062 Merge branch 'master' into navigator_rewrite_offboard2_merge
Conflicts:
	mavlink/include/mavlink/v1.0/common/common.h
	src/modules/mavlink/mavlink_receiver.cpp
2014-07-02 14:59:43 +02:00
Lorenz Meier
801d1d3198 commander: Update after merge 2014-07-01 09:51:35 +02:00
Lorenz Meier
efc992b4d9 Merged master into geo 2014-07-01 09:34:26 +02:00
Lorenz Meier
bbdf2bc07a commander: Notify negative on manual arming fails 2014-06-30 16:58:05 +02:00