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
e9290e7fc0
Merge branch 'master' of github.com:PX4/Firmware into origin_integration
2013-07-02 16:40:26 +02:00
794a2248f0
Only some small cleanup to att control
2013-06-24 17:24:49 +02:00
53dec130c4
Adapted flow estimator, position and velocity control to new state machine
2013-06-24 09:49:46 +02:00
72694825de
Copyright fixes
2013-06-22 11:28:21 +04:00
5cb1f4662f
multirotor_attitude_control performance improved, tested in flight. PID library new functionality and bugfixes.
2013-06-20 19:25:37 +04:00
a183f3e273
Merge remote-tracking branch 'drton/pid_fixes_drton_debug' into new_state_machine
...
Conflicts:
src/modules/multirotor_att_control/multirotor_att_control_main.c
src/modules/multirotor_att_control/multirotor_attitude_control.c
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/multirotor_att_control/multirotor_rate_control.h
src/modules/sdlog2/sdlog2.c
2013-06-20 12:52:16 +02:00
dec1fdbde0
Cleanup: remove useless angular rates from attitude rate controller
2013-06-20 11:52:05 +04:00
3bfc4ed517
Att rate PID fix
2013-06-20 11:38:19 +04:00
ece93ab628
Added integral reset for rate controller
2013-06-19 12:24:14 +02:00
c1049483a8
Added integral reset for rate controller
2013-06-19 12:01:22 +02:00
8d6cc86b4f
Cherry-picked commit e2ff60b0a6: use rateacc values
2013-06-19 10:01:16 +02:00
e2ff60b0a6
Use rollacc and pitchacc from the estimator instead of differentiating in the controller
2013-06-19 09:35:59 +02:00
c874f68108
Checkpoint: Quad is flying after PID lib changes
...
Conflicts:
src/modules/multirotor_att_control/multirotor_attitude_control.c
2013-06-17 21:10:38 +02:00
2daff9ebbf
Checkpoint: Quad is flying after PID lib changes
2013-06-17 21:03:55 +02:00
bca60b98bd
Merge branch 'pid_fixes' into new_state_machine
...
Conflicts:
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/sdlog2/sdlog2.c
src/modules/sdlog2/sdlog2_messages.h
and some fixes, logging of control PID values now working
2013-06-16 17:14:22 +02:00
2cb928d87c
Added ctrl debugging values
...
Conflicts:
src/modules/sdlog2/sdlog2.c
2013-06-16 15:25:24 +02:00
c189ac1c85
Added possibility to log pid control values
...
Conflicts:
apps/multirotor_pos_control/multirotor_pos_control.c
src/drivers/ardrone_interface/ardrone_interface.c
2013-06-16 15:22:20 +02:00
303694f5f7
Fixed pid bug, attitude was not controlled
2013-06-16 15:22:10 +02:00
bd7f86bb6a
Tried to add ctrl debug values to sdlog2 (WIP)
2013-06-16 14:59:00 +02:00
b52d561b11
Added ctrl debugging values
2013-06-16 12:59:50 +02:00
1ea9ff3640
Added possibility to log pid control values
...
Conflicts:
apps/multirotor_pos_control/multirotor_pos_control.c
src/drivers/ardrone_interface/ardrone_interface.c
2013-06-16 09:57:32 +02:00
68fb200f0b
Fixed pid bug, attitude was not controlled
2013-06-16 09:55:28 +02:00
3230f22446
Merge branch 'pid_fixes' into new_state_machine
2013-06-15 20:06:30 +02:00
8559315f4f
Added a filter parameter to the pid function
...
Conflicts:
apps/multirotor_pos_control/multirotor_pos_control.c
2013-06-15 20:06:13 +02:00
2b9fa731ef
Use the pid library in the rate controller and change de implementation of the D part
...
Conflicts:
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/systemlib/pid/pid.c
src/modules/systemlib/pid/pid.h
2013-06-15 20:05:03 +02:00
9f5565de32
Controllers should not access state machine anymore but access the vehicle_control_mode flags
2013-06-15 19:41:54 +02:00
90f5e30f2a
Introduced new actuator_safety topic
2013-06-14 13:53:26 +02:00
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
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
7ac617242d
docs fix
2013-04-27 19:27:24 +02:00
7ca82801bd
Moved multirotor controllers
2013-04-27 14:42:12 +02:00
Julian Oes