7a6d33ba47
Extend estimator status
2014-06-04 09:51:14 +02:00
34731a4f4e
Merge branch 'mtecs' into navigator_rewrite
2014-06-03 16:29:32 +02:00
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
854bb7fe08
navigator: mission class added (WIP)
2014-06-03 16:01:28 +02:00
bc24691de2
Merge branch 'mtecs' into mtecs_wind_estimate
2014-06-01 15:37:27 +02:00
fecbebc5a6
Merge branch 'master' of github.com:PX4/Firmware into mtecs
2014-06-01 15:37:14 +02:00
ad811304c8
actuator_armed: Fixed comments and doxygen, no C-level changes
2014-06-01 15:36:26 +02:00
ff4aec6588
wind estimate: added uORB topic
2014-06-01 15:34:27 +02:00
33356ed503
mtecs publish state
2014-05-30 19:36:06 +02:00
9bad828bc0
U-blox driver rework, step 2
...
Moved satellite info from vehicle_gps_position_s into a new uORB topic
satellite_info.
Renamed satellites_visible to satellites_used to reflect true content.
sdlog2 will log info for GPS satellites only for now.
2014-05-30 14:30:25 +02:00
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
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
55ad5588a8
system status topic: Add support for circuit breaker
2014-05-25 20:35:16 +02:00
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
56ac13aafb
introduce tecs status uorb message
2014-05-24 18:04:38 +02:00
4f26a8b7c8
gps topic: Added snr and jamming fields
2014-05-23 15:02:51 +02:00
7255aafcb5
Better docs in GPS topic
2014-05-23 13:00:22 +02:00
950571eaf6
Merge branch 'master' into offboard2
2014-05-21 10:40:58 +02:00
e92620b9b2
rc_channels topic cleanup
2014-05-20 23:15:58 +02:00
639d86eab2
Merge pull request #979 from PX4/acro2
...
ACRO mode
2014-05-20 08:36:49 -07:00
b12928548c
Merge branch 'master' into acro2
2014-05-20 00:03:00 +02:00
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
8c4b35cc23
Merge branch 'master' into offboard2
2014-05-16 12:12:43 +02:00
15699549a2
manual control setpoint: add comment about sign
2014-05-12 13:35:11 +02:00
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
d9333a1993
manual control setpoint: rename variables
2014-05-12 09:20:40 +02:00
c131e4cada
manual_control_setpoint: comments fixed
2014-05-11 23:46:12 +02:00
88b18bbad1
ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL
2014-05-11 13:35:05 +02:00
808badb34d
Use "POSCTL" switch name consistently
2014-05-11 12:54:15 +02:00
31089a290b
Replaces poshold/althold with posctrl/altctrl
2014-04-28 21:47:45 -07:00
269800b48c
renamed EASY to POSHOLD and SEATBELT to ALTHOLD
2014-04-27 14:06:00 -07:00
6a7b104c2b
compiles
2014-04-27 13:12:28 -07:00
07c35010aa
Merged in upstream master
2014-04-27 12:43:13 -07:00
c74248c8b1
Merged mpc_rc with master
2014-04-27 15:45:33 +02:00
e882824ee1
eph and epv renaming, make this compile again
2014-04-26 23:31:15 +02:00
e8531e8360
Merge remote-tracking branch 'px4/ekf_home_init' into navigator_cleanup_ekf_home_init
...
Conflicts:
src/modules/commander/commander.cpp
src/modules/mc_pos_control/mc_pos_control_main.cpp
src/modules/navigator/navigator_main.cpp
src/modules/uORB/topics/vehicle_global_position.h
2014-04-26 23:08:11 +02:00
13dfe0447c
Send current local position estimate as well
2014-04-26 16:07:29 +02:00
22d3bcdab6
Merged mpc_rc into ekf_params
2014-04-26 15:13:03 +02:00
3a12cb4648
Merge remote-tracking branch 'px4/master' into navigator_cleanup
2014-04-26 12:56:18 +02:00
4a949a9565
Merge pull request #749 from DonLakeFlyer/ArmDisarm
...
Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM
2014-04-26 12:24:42 +02:00
31b5d0f5c8
Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_merged
2014-04-25 20:30:01 -07:00
22aaae197b
Merge branch 'rc_timeout' into mpc_rc
2014-04-24 22:40:46 +02:00
63c50676f9
MISSION switch renamed to LOITER
2014-04-24 22:38:19 +02:00
7e621070ca
renamed mission_switch to loiter_switch and assisted_switch to easy_switch
2014-04-22 18:23:27 -07:00
d6e6ee3440
Merge branch 'rc_timeout' of https://github.com/TickTock-/Firmware into rc_merged
2014-04-22 17:43:36 -07:00
e4a4430f9f
Merge branch 'master' into rc_timeout
2014-04-22 11:18:07 +02:00
c3c0328e8b
navigator: lot's of cleanup (WIP)
2014-04-21 17:36:59 +02:00
0a89364e3c
Merge branch 'ArmDisarm' of github.com:DonLakeFlyer/Firmware into ekf_params
2014-04-21 11:23:35 +02:00
8634780e80
Merge branch 'master' into mpc_rc
2014-04-20 20:10:39 +02:00
654ab4635a
navigator: wrong mission topic was copied, clearer naming of offboard mission now
2014-04-18 22:05:49 +02:00
Lorenz Meier