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
|
422c675c55
|
Commented flow example slightly better
|
2013-07-05 11:44:25 +02:00 |
|
Julian Oes
|
53dec130c4
|
Adapted flow estimator, position and velocity control to new state machine
|
2013-06-24 09:49:46 +02:00 |
|
Lorenz Meier
|
92e0687022
|
Merge branch 'master' of github.com:PX4/Firmware into integration
|
2013-06-17 08:44:07 +02:00 |
|
Julian Oes
|
263b60c200
|
Hack to make flow controll to compile
|
2013-06-16 09:54:57 +02:00 |
|
Julian Oes
|
3230f22446
|
Merge branch 'pid_fixes' into new_state_machine
|
2013-06-15 20:06:30 +02:00 |
|
samuezih
|
b789e01a0f
|
Add PX4Flow board modules and corresponding ORB msgs.
|
2013-06-14 17:31:46 +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 |
|
Lorenz Meier
|
34b6a91860
|
Merge branch 'master' of github.com:PX4/Firmware into integration
|
2013-06-06 19:22:34 +02:00 |
|
Lorenz Meier
|
026cad832a
|
Hotfix: Added missing header
|
2013-06-06 18:53:33 +02:00 |
|
Lorenz Meier
|
6015809d89
|
Merged
|
2013-06-06 17:37:41 +02:00 |
|
Lorenz Meier
|
fa1b057bb1
|
Minor cleanup
|
2013-06-06 17:27:01 +02:00 |
|
Lorenz Meier
|
b09fc1468c
|
Hotfix: Fix typos in tutorial code
|
2013-06-06 17:25:47 +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
|
1edc36bfd4
|
More documentation
|
2013-05-25 23:01:55 +02:00 |
|
Lorenz Meier
|
bc7a7167ae
|
Go only to RC failsafe if throttle was half once - to prevent failsafe when armed on ground
|
2013-05-25 18:21:39 +02:00 |
|
Lorenz Meier
|
214ddd6f1c
|
Adjusted example params and extensively commented example
|
2013-05-25 18:16:15 +02:00 |
|
Lorenz Meier
|
81acd98997
|
Added limit to heading command
|
2013-05-23 08:54:08 +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
|
1ff6c80866
|
More example fixes
|
2013-05-13 08:28:36 +02:00 |
|
Lorenz Meier
|
6ea204c813
|
Added fixed wing controller example
|
2013-05-12 20:08:09 +02:00 |
|
Lorenz Meier
|
25612cebc2
|
Cleaned up NuttX appconfig, added examples to config
|
2013-04-28 10:37:07 +02:00 |
|
Lorenz Meier
|
13fc670386
|
Moved last libs, drivers and headers, cleaned up IO build
|
2013-04-28 09:54:11 +02:00 |
|