diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-22 06:48:49 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-22 06:48:49 +0200 |
| commit | 086fc7f758f48ecfa7e1ddd00957cf5c191eb445 (patch) | |
| tree | c4fbd7d6568db7b8b82386c7a6d61cb169f8252f /ROMFS/px4fmu_common/init.d/rcS | |
| parent | 5bb3e92d362c04ac57537a0ddaa515781076161e (diff) | |
| parent | 940becd0c1e39168e4836db5927e989f2d780ad3 (diff) | |
| download | px4-firmware-086fc7f758f48ecfa7e1ddd00957cf5c191eb445.tar.gz px4-firmware-086fc7f758f48ecfa7e1ddd00957cf5c191eb445.tar.bz2 px4-firmware-086fc7f758f48ecfa7e1ddd00957cf5c191eb445.zip | |
Merge pull request #1128 from PX4/uavcan
Basic UAVCAN support
Diffstat (limited to 'ROMFS/px4fmu_common/init.d/rcS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 8855539fe..24b2a299a 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -297,7 +297,17 @@ then # If OUTPUT_MODE == none then something is wrong with setup and we shouldn't try to enable output if [ $OUTPUT_MODE != none ] then - if [ $OUTPUT_MODE == io ] + if [ $OUTPUT_MODE == uavcan_esc ] + then + if uavcan start 1 + then + echo "CAN UP" + else + echo "CAN ERR" + fi + fi + + if [ $OUTPUT_MODE == io -o $OUTPUT_MODE == uavcan_esc ] then echo "[init] Use PX4IO PWM as primary output" if px4io start |