 Julian Oes
|
88389ea255
|
Merge branch 'master' into new_state_machine
compiling again
Conflicts:
src/modules/fixedwing_att_control/fixedwing_att_control_att.c
src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
src/modules/mavlink/orb_listener.c
src/modules/multirotor_att_control/multirotor_attitude_control.c
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/systemlib/pid/pid.c
src/modules/systemlib/pid/pid.h
src/modules/uORB/objects_common.cpp
|
2013-07-08 10:31:32 +02:00 |
|
|
Lorenz Meier
|
7ca0698a6b
|
Fixed HIL handling
|
2013-07-05 11:43:42 +02:00 |
|
|
Lorenz Meier
|
3686431231
|
Removed leftover mavlink_receiver.c file
|
2013-07-04 15:41:42 +02:00 |
|
|
Lorenz Meier
|
9aee419324
|
Updated mavlink version, massive improvements in mission lib, fixes to HIL (state and sensor level)
|
2013-07-04 15:40:20 +02:00 |
|
|
Julian Oes
|
202792294a
|
Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine
Conflicts:
src/drivers/px4io/px4io.cpp
src/modules/commander/commander.c
src/modules/commander/state_machine_helper.c
src/modules/commander/state_machine_helper.h
src/modules/px4iofirmware/mixer.cpp
src/modules/uORB/topics/actuator_controls.h
src/modules/uORB/topics/vehicle_status.h
|
2013-06-18 15:35:26 +02:00 |
|
|
Julian Oes
|
9f5565de32
|
Controllers should not access state machine anymore but access the vehicle_control_mode flags
|
2013-06-15 19:41:54 +02:00 |
|
|
Julian Oes
|
90f5e30f2a
|
Introduced new actuator_safety topic
|
2013-06-14 13:53:26 +02:00 |
|
|
Lorenz Meier
|
eb76d116cc
|
Minor state machine improvements and fixes for IO safety / in-air restart handling
|
2013-06-12 12:30:42 +02:00 |
|
|
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 |
|
|
px4dev
|
23a6234235
|
Rename our 'task_spawn' to 'task_spawn_cmd' since NuttX now has its own version of task_spawn that's different.
|
2013-06-01 23:31:53 +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 |
|