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
2f76c81147
More compile fixes
2013-07-16 09:08:05 +02:00
1b38cf715d
Renamed actuator_safety back to actuator_armed, compiling but untested
2013-07-15 22:15:15 +02:00
bf2ff98856
Merged master
2013-07-15 15:02:45 +02:00
897b541b12
General cleanup of /dev/px4io and /dev/px4fmu
...
- Use distinct common symbols for px4io and px4fmu device files, and use
instead of hardcoded filenames
- Use common symbols defining px4io bits consistently between px4fmu and
px4io builds.
2013-07-09 20:37:00 -04:00
369e6d1eea
gpio_led: minor usage fix
2013-07-06 18:37:02 +04:00
8d0784af61
gpio_led: PX4IO RELAY and ACC outputs support, some fixes
2013-07-06 18:30:09 +04:00
90f5e30f2a
Introduced new actuator_safety topic
2013-06-14 13:53:26 +02:00
ec08dec8ba
Two hacks here to make it compile
2013-06-12 12:47:00 +02:00
68931f38d5
HOTFIX: Added start / stop syntax to GPIO led command
2013-06-05 15:04:49 +02:00
6e8621269b
Code style fixed
2013-05-22 13:59:51 +04:00
09ce3e2d0a
Added GPIO_EXT1/GPIO_EXT2 selection.
2013-05-22 11:30:50 +04:00
9a9e41f7a2
Merge branch 'master' into gpio_led
2013-05-09 22:41:09 +04:00
Julian Oes