34058ae565
Merge branch 'master' of github.com:PX4/Firmware into integration
2013-06-17 09:57:47 +02:00
badaa5e4a2
Fixed too low stack sizes
2013-06-17 09:57:34 +02:00
92e0687022
Merge branch 'master' of github.com:PX4/Firmware into integration
2013-06-17 08:44:07 +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
216617431d
Logging of ctrl debug values working now
2013-06-16 16:18:40 +02:00
38558f0f16
Count and write for control debug loging was missing (still not working)
2013-06-16 16:00:44 +02:00
6f108e18d2
Just include the rate controls for now
2013-06-16 15:32:53 +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
138ce117ab
ATSP.ThrustSP added
2013-06-16 17:20:07 +04: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
562253c508
Fixed bug that I introduced in sdlog2
2013-06-16 11:55:08 +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
4253c16b3f
Increase array size.
2013-06-15 23:24:57 +02:00
12ac41802e
Log airspeed.
2013-06-15 22:58:14 +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
4c6cf3037d
Merge commit 'b714c5c9d1d38132df5cf4bff9a1fd92163be550' into seatbelt_multirotor
2013-06-15 11:49:14 +04:00
38ca3bd78a
multirotor_pos_control fixes, introduced HARD control mode (disabled by default)
2013-06-15 11:36:26 +04:00
b789e01a0f
Add PX4Flow board modules and corresponding ORB msgs.
2013-06-14 17:31:46 +02:00
e556649f2f
Beep when mode is not possible
2013-06-14 16:48:41 +02:00
5b21362e1f
Arming with IO working now
2013-06-14 16:04:23 +02:00
90f5e30f2a
Introduced new actuator_safety topic
2013-06-14 13:53:26 +02:00
e4b25f8570
Default parameters updated for position_estimator_inav and multirotor_pos_control
2013-06-13 17:12:13 +04:00
236053a600
Fixed param save
2013-06-13 15:04:16 +02:00
3945dae8d3
Merge branch 'master' of github.com:PX4/Firmware into integration
2013-06-13 08:27:13 +02:00
46aadb96b6
Merge branch 'sdlog2' into seatbelt_multirotor
2013-06-13 07:59:10 +04:00
95236c379a
sdlog2: ARSP (attitude rates setpoint) message added, attitude rates added to ATT message
2013-06-13 06:51:09 +04:00
4cdee2be03
position_estimator_inav cosmetic changes
2013-06-13 06:49:17 +04:00
4860c73008
multirotor_pos_control: position controller implemented
2013-06-13 06:48:24 +04:00
c3a8f177b6
Software version check fixes
2013-06-12 12:58:17 +02:00
ec08dec8ba
Two hacks here to make it compile
2013-06-12 12:47:00 +02:00
eb76d116cc
Minor state machine improvements and fixes for IO safety / in-air restart handling
2013-06-12 12:30:42 +02:00
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
4256e43de7
Complete position estimator implemented (GPS + Baro + Accel)
2013-06-10 23:16:04 +04:00
9444def5f8
Merge branch 'master' into fmuv2_bringup
2013-06-10 15:01:44 +02:00
afb34950a3
Merge branch 'master' into seatbelt_multirotor
2013-06-10 16:21:10 +04:00
1028bd932c
Extended vehicle detection
2013-06-10 07:39:12 +02:00
8b67f88331
Play warning tune
2013-06-09 14:12:17 +02:00
1deced7629
Added safety status feedback, disallow arming of a rotary wing with engaged safety
2013-06-09 14:09:09 +02:00
a16d60e825
Merge branch 'master' of github.com:PX4/Firmware into io_fixes
2013-06-09 11:48:27 +02:00
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
3023ef9059
Merge branch 'master' of github.com:PX4/Firmware into io_fixes
2013-06-07 21:45:42 +02:00
048967fb6f
merged
2013-06-07 21:33:49 +02:00
7b98f0a567
sdlog2 minor fix
2013-06-07 22:12:21 +04:00
Lorenz Meier