diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-24 16:26:42 +0200 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-24 16:26:42 +0200 |
commit | e52f7770be443301a40ee6df40498c64083b4884 (patch) | |
tree | 4ce8013d008e2e78cbca76fba72813bc4f918c02 /ROMFS/px4fmu_common/init.d/rcS | |
parent | bdccd69030e56381d906afeabc8305dbe18e2de6 (diff) | |
parent | 3454c42596d8c0c1bec59dec87f4a53910f83731 (diff) | |
download | px4-firmware-e52f7770be443301a40ee6df40498c64083b4884.tar.gz px4-firmware-e52f7770be443301a40ee6df40498c64083b4884.tar.bz2 px4-firmware-e52f7770be443301a40ee6df40498c64083b4884.zip |
Merge remote-tracking branch 'upstream/master' into obcfailsafe
Diffstat (limited to 'ROMFS/px4fmu_common/init.d/rcS')
-rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index c9e6a27ca..195771905 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -304,11 +304,10 @@ then then if [ $OUTPUT_MODE == uavcan_esc ] then - if uavcan start 1 + if param compare UAVCAN_ENABLE 0 then - echo "CAN UP" - else - echo "CAN ERR" + echo "[init] OVERRIDING UAVCAN_ENABLE = 1" + param set UAVCAN_ENABLE 1 fi fi @@ -448,6 +447,11 @@ then mavlink start $MAVLINK_FLAGS # + # UAVCAN + # + sh /etc/init.d/rc.uavcan + + # # Sensors, Logging, GPS # sh /etc/init.d/rc.sensors |