f3ce61d740
Forgot to remove some debug stuff
2013-06-19 09:35:19 +02:00
202792294a
Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine
...
Conflicts:
src/drivers/px4io/px4io.cpp
src/modules/commander/commander.c
src/modules/commander/state_machine_helper.c
src/modules/commander/state_machine_helper.h
src/modules/px4iofirmware/mixer.cpp
src/modules/uORB/topics/actuator_controls.h
src/modules/uORB/topics/vehicle_status.h
2013-06-18 15:35:26 +02:00
34c197c7cc
Merge remote-tracking branch 'upstream/master' into new_state_machine
2013-06-18 10:26:48 +02:00
b5f4f1ee80
Adressed performance concern and fixed a copy paste bug
2013-06-18 10:00:42 +02:00
b23f238d98
Merge pull request #311 from DrTon/sdlog2
...
sdlog2 bugs fixed
2013-06-17 23:35:15 -07:00
447fc5e291
sdlog2 bugs fixed
2013-06-18 10:31:24 +04:00
cc452834c0
First try to prevent motors from stopping when armed
2013-06-18 00:30:10 +02:00
2daff9ebbf
Checkpoint: Quad is flying after PID lib changes
2013-06-17 21:03:55 +02:00
52f8565f0b
Corrected number of ORB structs in sdlog2
2013-06-17 21:02:52 +02:00
a25d68440d
Merge with att_fix
2013-06-17 21:01:25 +02:00
419750fe61
Merge pull request #309 from DrTon/sdlog2
...
sdlog2 critical bug fixed, added ARSP message
2013-06-17 06:42:59 -07:00
7bb78a4f9b
Merge remote-tracking branch 'drton/sdlog2' into new_state_machine
...
Conflicts:
src/modules/sdlog2/sdlog2.c
2013-06-17 14:45:20 +02:00
a11895ac43
Critical bug fixed, cleanup
2013-06-17 16:06:35 +04:00
d9f30858c8
sdlog2 messages ID fix
2013-06-17 14:46:18 +04:00
22a925adeb
Merge branch 'master' into sdlog2
2013-06-17 14:44:45 +04:00
badaa5e4a2
Fixed too low stack sizes
2013-06-17 09:57:34 +02:00
c240e843aa
Merge pull request #305 from sjwilks/sdlog-airspeed
...
Add airspeed logging to sdlog2.
2013-06-16 13:46:35 -07:00
f1419d4f5f
Merge pull request #307 from sjwilks/ets-airspeed-fix
...
Fix the usage help and lots of formatting fixes.
2013-06-16 12:29:37 -07:00
24cb66c833
And yet more formatting cleanups
2013-06-16 21:17:07 +02:00
7a99de9d30
More formatting cleanups
2013-06-16 21:07:42 +02:00
9e26e8de79
Merge pull request #306 from sjwilks/hott-airspeed
...
Report airspeed via HoTT telemetry
2013-06-16 11:53:29 -07:00
1fc3c8f723
Fix usage help and cleanup formatting
2013-06-16 20:52:15 +02:00
dadac932da
Report airspeed over HoTT telemetry
2013-06-16 20:44:11 +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
263b60c200
Hack to make flow controll to compile
2013-06-16 09:54:57 +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
b714c5c9d1
Merge pull request #303 from samized/flowboard_master
...
Add PX4Flow board modules and corresponding ORB msgs.
2013-06-14 13:20:43 -07: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
236053a600
Fixed param save
2013-06-13 15:04:16 +02:00
54cd1d055f
Merge remote-tracking branch 'upstream/master' into new_state_machine
2013-06-13 13:36:54 +02:00
Julian Oes