762 Commits

Author SHA1 Message Date
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
Anton Babushkin
950571eaf6 Merge branch 'master' into offboard2 2014-05-21 10:40:58 +02:00
Lorenz Meier
639d86eab2 Merge pull request #979 from PX4/acro2
ACRO mode
2014-05-20 08:36:49 -07:00
Lorenz Meier
4fdc016308 Merge pull request #970 from PX4/flow_no_gps
Allow POSCTL with only PX4FLOW (without GPS)
2014-05-20 08:35:42 -07:00
Anton Babushkin
559bfbb11c commander: allow disarm in ACRO mode 2014-05-20 16:42:11 +02:00
Anton Babushkin
b12928548c Merge branch 'master' into acro2 2014-05-20 00:03:00 +02:00
Anton Babushkin
32ae2dd1d0 commander: missed 'break' in 'switch' added 2014-05-17 11:00:14 +02:00
Anton Babushkin
692e8f84a9 commander: don't require good EPH for local_position_valid, position_estimator_inav: estimate EPH/EPV and publish it in local position topic 2014-05-16 22:12:07 +02:00
Anton Babushkin
8c4b35cc23 Merge branch 'master' into offboard2 2014-05-16 12:12:43 +02:00
Lorenz Meier
1e13b5a02c commander: Reduce calibration count, minimally reduce stack sizes after careful inspection 2014-05-15 09:02:31 +02:00
Lorenz Meier
8dc0a21a7e mavlink, commander: Get back close to original stack sizes. Although tests came clean, we do not want to take any chances 2014-05-15 07:14:58 +02:00
Lorenz Meier
531ba79e55 Reduce commander stack size mildly 2014-05-14 19:34:37 +02:00
Thomas Gubler
7c75f61863 Merge remote-tracking branch 'upstream/master' into manualcontrolrename
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/uORB/topics/manual_control_setpoint.h
2014-05-12 09:39:52 +02:00
Thomas Gubler
cde4c9addb commander: use new manual control setpoint variable names 2014-05-12 09:21:39 +02:00
Lorenz Meier
dd04a70afa Reporting cleanup, use different variables for different state switching results to avoid being tripped on local / global name scope 2014-05-11 18:10:02 +02:00
Anton Babushkin
349809f535 sensors, commander: code style fixed 2014-05-11 13:36:51 +02:00
Anton Babushkin
88b18bbad1 ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL 2014-05-11 13:35:05 +02:00
Lorenz Meier
e18bdfdf65 Merge pull request #858 from TickTock-/rc_merged
Rc merged
2014-05-08 23:21:22 -07:00
Julian Oes
26f5e550c4 Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_params
Conflicts:
	src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp
2014-05-07 21:11:21 +02:00
Lorenz Meier
8dd0453edc Merge pull request #909 from PX4/failsafe_reporting
Much better failsafe reporting on failsafe state changes
2014-05-07 02:10:53 -07:00
Lorenz Meier
0c318f9ad7 commander: Fix the position failsafe to a) use proper logic to determine if eph / epv are good or not (the previous logic was in some states not initialized) and b) add a hysteresis time - because the check as it was before had zero hysteresis time for a bad eph / epv value 2014-05-07 08:42:57 +02:00
Lorenz Meier
32b84b9652 Much better failsafe reporting on failsafe state changes 2014-05-06 21:46:59 +02:00
Lorenz Meier
1d6b9fae03 Fix in-air restarts, protect against an external MAVLink sender exploiting the restart mechanism 2014-05-06 14:57:06 +02:00
Thomas Gubler
548c7f4aaf geo: introduce global/local coordinate frame converter which uses the map projection but also converts altitude 2014-05-06 14:56:47 +02:00
Thomas Gubler
596b06ff2e commander: init gps eph and epv to large values, safer map projection initialization 2014-05-06 11:24:43 +02:00
Thomas Gubler
7ab428976e fix wrong variable name 2014-05-05 16:49:21 +02:00
Thomas Gubler
6e0690fde1 init global map projection when gps is valid 2014-05-05 16:44:02 +02:00
Thomas Gubler
67e3c808d2 remove home position valid flag 2014-05-05 15:40:02 +02:00
Thomas Gubler
60ccbaa8bb init global map reference in commander and not in navigator 2014-05-05 15:37:53 +02:00
TickTock-
6c76e8ea50 shortened rc_assisted_th to rc_assist_th in case we add a dedicated switch mapping later 2014-04-29 20:51:04 -07:00
Thomas Gubler
775499321a Merge remote-tracking branch 'upstream/master' into geo 2014-04-29 15:42:07 +02:00
TickTock-
31089a290b Replaces poshold/althold with posctrl/altctrl 2014-04-28 21:47:45 -07:00
TickTock-
269800b48c renamed EASY to POSHOLD and SEATBELT to ALTHOLD 2014-04-27 14:06:00 -07:00
TickTock-
6a7b104c2b compiles 2014-04-27 13:12:28 -07:00
TickTock-
07c35010aa Merged in upstream master 2014-04-27 12:43:13 -07:00
Lorenz Meier
e6d332aa7c Make commander less pedantic about position status 2014-04-27 15:50:53 +02:00
Lorenz Meier
c74248c8b1 Merged mpc_rc with master 2014-04-27 15:45:33 +02:00
Julian Oes
03d87c2660 Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_home_init
Conflicts:
	src/drivers/gps/gps.cpp
2014-04-27 11:41:34 +02:00