diff options
| author | Julian Oes <julian@oes.ch> | 2013-12-03 20:50:52 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-12-03 20:50:52 +0100 |
| commit | 03a54260012bffb63ae052829d1258ba81cfdebc (patch) | |
| tree | 104ce264fa47ca20803c316dd5d9c030be2caa98 /ROMFS | |
| parent | f2c303679ea859bf722eaa7289fd10f8b806264a (diff) | |
| parent | e034f5135ebabeb751ea775f2d79440cf74c8047 (diff) | |
| download | px4-firmware-03a54260012bffb63ae052829d1258ba81cfdebc.tar.gz px4-firmware-03a54260012bffb63ae052829d1258ba81cfdebc.tar.bz2 px4-firmware-03a54260012bffb63ae052829d1258ba81cfdebc.zip | |
Merge branch 'fw_autoland_att_tecs_navigator' into bottle_drop_navigator
Conflicts:
src/modules/navigator/navigator_main.cpp
Diffstat (limited to 'ROMFS')
| -rwxr-xr-x | ROMFS/px4fmu_common/init.d/rcS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 6c76f5fe9..f318d2134 100755 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -112,6 +112,11 @@ then commander start # + # Start the datamanager + # + dataman start + + # # Start the Navigator # navigator start |