Julian Oes
|
88389ea255
|
Merge branch 'master' into new_state_machine
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
|
2013-07-08 10:31:32 +02:00 |
|
Lorenz Meier
|
e9290e7fc0
|
Merge branch 'master' of github.com:PX4/Firmware into origin_integration
|
2013-07-02 16:40:26 +02:00 |
|
Julian Oes
|
0ecc9c4bf4
|
Shrinking the main commander file a bit
|
2013-06-25 16:30:35 +02:00 |
|
Julian Oes
|
9ce2b62eb5
|
Beep when arming or disarming with RC
|
2013-06-25 14:45:27 +02:00 |
|
Julian Oes
|
a6ba7e4485
|
Dropped superseded safety topic, added warning tones before arming
|
2013-06-25 13:15:38 +02:00 |
|
Julian Oes
|
60e9ea977d
|
Conditions where set wrongly in the first 2s after boot
|
2013-06-24 09:50:55 +02:00 |
|
Anton Babushkin
|
72694825de
|
Copyright fixes
|
2013-06-22 11:28:21 +04:00 |
|
Julian Oes
|
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 |
|
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 |
|
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 |
|
Lorenz Meier
|
eb76d116cc
|
Minor state machine improvements and fixes for IO safety / in-air restart handling
|
2013-06-12 12:30:42 +02: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 |
|
px4dev
|
23a6234235
|
Rename our 'task_spawn' to 'task_spawn_cmd' since NuttX now has its own version of task_spawn that's different.
|
2013-06-01 23:31:53 +02:00 |
|
Julian Oes
|
f5c157e74d
|
Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
src/drivers/px4io/px4io.cpp
src/modules/commander/commander.c
src/modules/commander/state_machine_helper.c
|
2013-05-17 11:24:02 +02:00 |
|
Lorenz Meier
|
79f9b61aff
|
Fixed led patterns to be up to the latest specs
|
2013-05-12 20:05:20 +02:00 |
|
Lorenz Meier
|
0c43da3b64
|
Tested with PX4FMU and PX4IO with GPS and arming
|
2013-05-12 13:11:12 +02:00 |
|
Lorenz Meier
|
fa1b7388f3
|
Implemented new led status proposal
|
2013-05-09 17:34:00 +02:00 |
|
Lorenz Meier
|
614bbb1510
|
Merged ETS airspeed driver
|
2013-05-09 15:58:23 +02:00 |
|
Lorenz Meier
|
44df8db984
|
Merge branch 'master' of github.com:PX4/Firmware into export-build
|
2013-05-06 23:50:23 +02:00 |
|
Lorenz Meier
|
eac9e10a83
|
Moved calibration
|
2013-05-06 23:50:14 +02:00 |
|
Lorenz Meier
|
4611fca7b4
|
Merge branch 'master' of github.com:PX4/Firmware into export-build
|
2013-05-06 07:54:55 +02:00 |
|
Lorenz Meier
|
e6ed8268ee
|
Moved position_estimator_mc, px4io driver and sdlog app to new style build
|
2013-04-27 12:59:47 +02:00 |
|
px4dev
|
01e427b17c
|
Merge working changes into export-build branch.
|
2013-04-26 16:14:32 -07:00 |
|