Julian Oes
|
56575eb068
|
Merge remote-tracking branch 'px4/new_state_machine_drton' into fmuv2_bringup_new_state_machine_drton
Conflicts:
src/drivers/blinkm/blinkm.cpp
src/drivers/px4io/px4io.cpp
src/modules/commander/state_machine_helper.c
src/modules/px4iofirmware/protocol.h
src/modules/px4iofirmware/registers.c
src/modules/systemlib/systemlib.h
src/systemcmds/reboot/reboot.c
|
2013-08-15 14:04:46 +02:00 |
|
px4dev
|
9d6ec6b365
|
Restructure things so that the PX4 configs move out of the NuttX tree, and most of the PX4-specific board configuration data moves out of the config and into the board driver.
Rename some directories that got left behind in the great board renaming.
|
2013-08-02 22:34:55 -07:00 |
|
Lorenz Meier
|
1410625dea
|
Enabled additional drivers on v2, kill misplaced code in mkblctrl
|
2013-07-28 16:12:40 +02:00 |
|
Julian Oes
|
1b38cf715d
|
Renamed actuator_safety back to actuator_armed, compiling but untested
|
2013-07-15 22:15:15 +02:00 |
|
Lorenz Meier
|
bf2ff98856
|
Merged master
|
2013-07-15 15:02:45 +02:00 |
|
Lorenz Meier
|
ced2871263
|
Merged mkblctrl
|
2013-07-08 20:48:30 +02:00 |
|
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 |
|
marco
|
209dc7100e
|
mkclctrl 8/11Bit support, uOrb Topic added, ESC Topic to Sdlog2 added
|
2013-07-02 19:46:15 +02:00 |
|
Julian Oes
|
90f5e30f2a
|
Introduced new actuator_safety topic
|
2013-06-14 13:53:26 +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 |
|
marco
|
73d2baeb20
|
comments cleaned
|
2013-05-26 16:49:33 +02:00 |
|
marco
|
8e1571cf02
|
mkblctrl cleanup & tested
|
2013-05-24 20:16:47 +02:00 |
|
marco
|
9f090e651a
|
mkblctrl cleanup
|
2013-05-23 21:03:49 +02:00 |
|
Lorenz Meier
|
8c6abe717d
|
Moved BLCTRL driver to new world
|
2013-05-05 11:24:31 +02:00 |
|