aboutsummaryrefslogtreecommitdiff
path: root/src/modules/multirotor_att_control/multirotor_att_control_main.c
Commit message (Collapse)AuthorAgeFilesLines
* mc_att_control_vector fix, multirotor_attitude_control and ↵Anton Babushkin2013-12-301-465/+0
| | | | multirotor_pos_control removed
* Moving nav state from commander to navigator, WIPAnton Babushkin2013-12-291-1/+1
|
* Piping through manual control channelsLorenz Meier2013-10-151-0/+6
|
* multirotor_att_control: cleanup, some refactoringAnton Babushkin2013-10-071-199/+198
|
* Full failsafe rewrite.Anton Babushkin2013-08-271-57/+41
|
* multirotor_att_control: yaw control bug fixedAnton Babushkin2013-08-271-14/+17
|
* Merged seatbelt_multirotor_newLorenz Meier2013-08-231-43/+59
|\
| * multirotor_att_control: yaw setpoint reset fixAnton Babushkin2013-08-221-50/+53
| |
* | Reset yaw position when disarmed in multirotor controllerJulian Oes2013-08-221-16/+2
|/
* vehicle_control_mode.flag_armed added, reset integrals in ↵Anton Babushkin2013-08-191-19/+14
| | | | multirotor_att_control when disarmed
* commander, multirotor_att_control, position_estimator_inav: position valid ↵Anton Babushkin2013-08-171-7/+13
| | | | flag fixed, other fixes and cleaunup
* commander, multirotor_pos_control, multirotor_att_control: bugfixesAnton Babushkin2013-08-161-4/+4
|
* multirotor_att_control: run rate controller only if vehicle_control_mode ↵Anton Babushkin2013-08-161-20/+23
| | | | flag set, codestyle fixed
* Merge branch 'seatbelt_multirotor' into seatbelt_multirotor_newAnton Babushkin2013-08-161-81/+90
|\ | | | | | | WIP, TODO fixedwing
| * Merge branch 'master' into seatbelt_multirotorAnton Babushkin2013-07-081-1/+1
| |\
| * | Merge branch 'master' into seatbelt_multirotorAnton Babushkin2013-05-171-33/+50
| | |
* | | Renamed actuator_safety back to actuator_armed, compiling but untestedJulian Oes2013-07-151-9/+9
| | |
* | | Merge branch 'master' into new_state_machineJulian Oes2013-07-081-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Rename our 'task_spawn' to 'task_spawn_cmd' since NuttX now has its own ↵px4dev2013-06-011-1/+1
| |/ | | | | | | version of task_spawn that's different.
* | Only some small cleanup to att controlJulian Oes2013-06-241-77/+23
| |
* | Adapted flow estimator, position and velocity control to new state machineJulian Oes2013-06-241-1/+1
| |
* | Merge remote-tracking branch 'drton/pid_fixes_drton_debug' into ↵Julian Oes2013-06-201-7/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Cleanup: remove useless angular rates from attitude rate controllerAnton Babushkin2013-06-201-7/+1
| | |
| * | Cherry-picked commit e2ff60b0a6dbcd714d57e781d9fe174b110a6237: use rateacc ↵Julian Oes2013-06-191-5/+21
| |/ | | | | | | values
* | Use rollacc and pitchacc from the estimator instead of differentiating in ↵Julian Oes2013-06-191-5/+12
| | | | | | | | the controller
* | Merge branch 'pid_fixes' into new_state_machineJulian Oes2013-06-161-3/+11
|\| | | | | | | | | | | | | | | | | 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
* | Controllers should not access state machine anymore but access the ↵Julian Oes2013-06-151-22/+23
| | | | | | | | vehicle_control_mode flags
* | Introduced new actuator_safety topicJulian Oes2013-06-141-5/+16
| |
* | Merge remote-tracking branch 'upstream/master' into new_state_machineJulian Oes2013-05-171-32/+38
|/ | | | | | | Conflicts: src/drivers/px4io/px4io.cpp src/modules/commander/commander.c src/modules/commander/state_machine_helper.c
* Moved multirotor controllersLorenz Meier2013-04-271-0/+485