Commit Graph

9 Commits

Author SHA1 Message Date
Julian Oes 7f90ebf537 Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
	src/examples/fixedwing_control/main.c
2013-06-12 12:24:52 +02:00
Lorenz Meier 327d8751d2 Hotfix: Removing GPS debug output 2013-05-22 17:53:17 +02:00
Lorenz Meier 5d9512eb79 Removed unnecessary cplusplus check 2013-05-21 10:17:37 +02:00
Lorenz Meier e655c0fc57 Fixed missing count 2013-05-21 10:14:16 +02:00
Lorenz Meier 5dfde44c56 Fixed va args in MAVLink, tested with RC config, correct output 2013-05-21 09:14:22 +02:00
Lorenz Meier d720944efe VA args now supported by MAVLink text messages 2013-05-21 09:14:22 +02:00
Julian Oes f5c157e74d Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
	src/drivers/px4io/px4io.cpp
	src/modules/commander/commander.c
	src/modules/commander/state_machine_helper.c
2013-05-17 11:24:02 +02:00
Lorenz Meier 3152dae3dc Merged with master 2013-05-09 15:52:36 +02:00
Lorenz Meier d8a3454538 Cut over MAVLink to new build system 2013-04-27 11:45:46 +02:00