Julian Oes
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
Julian Oes
216617431d
Logging of ctrl debug values working now
2013-06-16 16:18:40 +02:00
Julian Oes
38558f0f16
Count and write for control debug loging was missing (still not working)
2013-06-16 16:00:44 +02:00
Julian Oes
6f108e18d2
Just include the rate controls for now
2013-06-16 15:32:53 +02:00
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
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
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
9f5565de32
Controllers should not access state machine anymore but access the vehicle_control_mode flags
2013-06-15 19:41:54 +02:00
Lorenz Meier
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
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
Julian Oes
236053a600
Fixed param save
2013-06-13 15:04:16 +02:00
Julian Oes
54cd1d055f
Merge remote-tracking branch 'upstream/master' into new_state_machine
2013-06-13 13:36:54 +02:00
Lorenz Meier
f28cec350c
Hotfix: Excluded sdlog app from standard build, still keeping code in place for now
2013-06-13 12:44:11 +02:00
Julian Oes
ec08dec8ba
Two hacks here to make it compile
2013-06-12 12:47:00 +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
Lorenz Meier
42ce3112ad
Merge pull request #299 from DrTon/sdlog2
...
sdlog2: RC (RC controls) and OUT0 (actuator 0 output) messages added
2013-06-09 02:48:06 -07:00
Anton Babushkin
f8f83d5896
Merge branch 'master' into sdlog2
2013-06-08 18:16:33 +04: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
5a9e52a287
Merge branch 'master' of github.com:PX4/Firmware
2013-06-07 21:16:40 +02:00
Lorenz Meier
66879e6ff6
Hotfix: Make maxoptimization configurable from the shell via MAXOPTIMIZATION=-O0 V=1 make archives
2013-06-07 21:16:31 +02:00
Lorenz Meier
7a365e8af7
Merge pull request #297 from DrTon/sdlog2
...
sdlog2: new log messages added, ajustable log buffer
2013-06-07 12:04:58 -07:00
Anton Babushkin
7b98f0a567
sdlog2 minor fix
2013-06-07 22:12:21 +04:00
Anton Babushkin
59b26eca48
sdlog2 -b option (log buffer size) added, minor cleanup
2013-06-07 22:02:40 +04:00
Anton Babushkin
d39999425d
sdlog2 fixes
2013-06-07 21:32:58 +04:00
Lorenz Meier
aa641b5c34
Hotfix: Renamed max NSH argument variable to correct define
2013-06-07 18:00:37 +02:00
Anton Babushkin
03357f89fd
Merge branch 'master' into sdlog2
2013-06-07 19:29:14 +04:00
Anton Babushkin
5bad186916
sdlog2: STAT (vehicle state) log message added, minor optimizations
2013-06-07 13:36:15 +04:00
Lorenz Meier
5c74809dac
Config change: Set USB console as default.
2013-06-07 10:38:09 +02:00
Lorenz Meier
5b5d20bb63
Hotfix: Add an IO pass mixer with 8 outputs
2013-06-07 10:37:31 +02:00
Lorenz Meier
4e3f4b57e3
Hotfix: Allow the IO mixer loading to load larger mixers, fix up the px4io test command to allow a clean exit
2013-06-07 10:36:56 +02:00
Lorenz Meier
11544d27b7
Hotfix: Enlarge the buffer size for mixers, ensure that reasonable setups with 16 outputs can work
2013-06-07 10:35:37 +02:00
Lorenz Meier
6c7c130de7
Hotfix: Make IOs mixer loading pedantic to make sure the full mixer loads
2013-06-07 10:34:55 +02:00
px4dev
4302f76402
Hotfix: fix building firmware parallel
2013-06-06 22:49:49 -07:00
Lorenz Meier
b52aeea746
Merge branch 'master' of github.com:PX4/Firmware
2013-06-06 22:14:19 +02:00
Lorenz Meier
b3c5bd5d3a
Saved a few string bytes, cleaned up task names and output
2013-06-06 22:14:11 +02:00
Anton Babushkin
4052652a28
sdlog2: ATTC - vehicle attitude control logging added
2013-06-06 23:19:16 +04:00
Lorenz Meier
2aa16dc447
Hotfix: Disable instrumentation on IO
2013-06-06 19:12:10 +02:00
Lorenz Meier
026cad832a
Hotfix: Added missing header
2013-06-06 18:53:33 +02:00
Julian Oes