24614 Commits

Author SHA1 Message Date
Julian Oes
2cb928d87c Added ctrl debugging values
Conflicts:
	src/modules/sdlog2/sdlog2.c
2013-06-16 15:25:24 +02:00
Julian Oes
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
Julian Oes
303694f5f7 Fixed pid bug, attitude was not controlled 2013-06-16 15:22:10 +02:00
Anton Babushkin
138ce117ab ATSP.ThrustSP added 2013-06-16 17:20:07 +04:00
Julian Oes
bd7f86bb6a Tried to add ctrl debug values to sdlog2 (WIP) 2013-06-16 14:59:00 +02:00
Julian Oes
b52d561b11 Added ctrl debugging values 2013-06-16 12:59:50 +02:00
Julian Oes
562253c508 Fixed bug that I introduced in sdlog2 2013-06-16 11:55:08 +02:00
Julian Oes
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
Julian Oes
68fb200f0b Fixed pid bug, attitude was not controlled 2013-06-16 09:55:28 +02:00
Julian Oes
263b60c200 Hack to make flow controll to compile 2013-06-16 09:54:57 +02:00
Simon Wilks
4253c16b3f Increase array size. 2013-06-15 23:24:57 +02:00
Simon Wilks
12ac41802e Log airspeed. 2013-06-15 22:58:14 +02:00
Julian Oes
3230f22446 Merge branch 'pid_fixes' into new_state_machine 2013-06-15 20:06:30 +02:00
Julian Oes
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
Julian Oes
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
Julian Oes
65d36c44af Prevent flips at high throttle
Conflicts:
	src/drivers/ardrone_interface/ardrone_motor_control.c
2013-06-15 19:53:25 +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
Anton Babushkin
4c6cf3037d Merge commit 'b714c5c9d1d38132df5cf4bff9a1fd92163be550' into seatbelt_multirotor 2013-06-15 11:49:14 +04:00
Anton Babushkin
38ca3bd78a multirotor_pos_control fixes, introduced HARD control mode (disabled by default) 2013-06-15 11:36:26 +04:00
samuezih
b789e01a0f Add PX4Flow board modules and corresponding ORB msgs. 2013-06-14 17:31:46 +02:00
Julian Oes
e556649f2f Beep when mode is not possible 2013-06-14 16:48:41 +02:00
Julian Oes
5b21362e1f Arming with IO working now 2013-06-14 16:04:23 +02:00
Julian Oes
90f5e30f2a Introduced new actuator_safety topic 2013-06-14 13:53:26 +02:00
Sam Kelly
53f29a25b6 Added l3gd20h detection 2013-06-13 12:51:50 -07:00
Anton Babushkin
e4b25f8570 Default parameters updated for position_estimator_inav and multirotor_pos_control 2013-06-13 17:12:13 +04:00
Julian Oes
236053a600 Fixed param save 2013-06-13 15:04:16 +02:00
px4dev
8eb4a03274 Use a better way of guessing whether we can use both-edges mode. 2013-06-12 23:58:22 -07:00
Lorenz Meier
3945dae8d3 Merge branch 'master' of github.com:PX4/Firmware into integration 2013-06-13 08:27:13 +02:00
Anton Babushkin
46aadb96b6 Merge branch 'sdlog2' into seatbelt_multirotor 2013-06-13 07:59:10 +04:00
Anton Babushkin
95236c379a sdlog2: ARSP (attitude rates setpoint) message added, attitude rates added to ATT message 2013-06-13 06:51:09 +04:00
Anton Babushkin
4cdee2be03 position_estimator_inav cosmetic changes 2013-06-13 06:49:17 +04:00
Anton Babushkin
4860c73008 multirotor_pos_control: position controller implemented 2013-06-13 06:48:24 +04:00
Lorenz Meier
c3a8f177b6 Software version check fixes 2013-06-12 12:58:17 +02:00
Julian Oes
ec08dec8ba Two hacks here to make it compile 2013-06-12 12:47:00 +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
Anton Babushkin
4256e43de7 Complete position estimator implemented (GPS + Baro + Accel) 2013-06-10 23:16:04 +04:00
Lorenz Meier
9444def5f8 Merge branch 'master' into fmuv2_bringup 2013-06-10 15:01:44 +02:00
Anton Babushkin
afb34950a3 Merge branch 'master' into seatbelt_multirotor 2013-06-10 16:21:10 +04:00
Lorenz Meier
1028bd932c Extended vehicle detection 2013-06-10 07:39:12 +02:00
Lorenz Meier
8b67f88331 Play warning tune 2013-06-09 14:12:17 +02:00
Lorenz Meier
1deced7629 Added safety status feedback, disallow arming of a rotary wing with engaged safety 2013-06-09 14:09:09 +02:00
Lorenz Meier
b12678014f Fixed chan count logic 2013-06-09 14:04:13 +02:00
Lorenz Meier
4ef87206ec Code formatting and warning fixes 2013-06-09 14:03:49 +02:00
Lorenz Meier
d2c5990d6f Fixed pwm count check 2013-06-09 12:41:47 +02:00
Lorenz Meier
a16d60e825 Merge branch 'master' of github.com:PX4/Firmware into io_fixes 2013-06-09 11:48:27 +02:00
Anton Babushkin
079cb2cd65 sdlog2: RC (RC controls) and OUT0 (actuator 0 output) messages added, print statistics to mavlink console 2013-06-08 18:15:55 +04:00
Lorenz Meier
3023ef9059 Merge branch 'master' of github.com:PX4/Firmware into io_fixes 2013-06-07 21:45:42 +02:00
Lorenz Meier
048967fb6f merged 2013-06-07 21:33:49 +02:00
Anton Babushkin
7b98f0a567 sdlog2 minor fix 2013-06-07 22:12:21 +04:00