diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 17:03:02 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 17:03:02 +0200 |
| commit | 478f923331cb8c3fd0e98a99afee462e4e158d44 (patch) | |
| tree | 59242aaa2fd8df814317e96117648fc4598c50c3 /ROMFS/px4fmu_common/init.d | |
| parent | 8a25c48071ed794b33e23f7ff7737cded58bea11 (diff) | |
| parent | 3c5f35da73cb6c37cf45a06909631e13b762f76d (diff) | |
| download | px4-firmware-478f923331cb8c3fd0e98a99afee462e4e158d44.tar.gz px4-firmware-478f923331cb8c3fd0e98a99afee462e4e158d44.tar.bz2 px4-firmware-478f923331cb8c3fd0e98a99afee462e4e158d44.zip | |
Merged master into mpc_in_flight_lock
Diffstat (limited to 'ROMFS/px4fmu_common/init.d')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/3031_phantom | 4 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.usb | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 9 |
3 files changed, 9 insertions, 6 deletions
diff --git a/ROMFS/px4fmu_common/init.d/3031_phantom b/ROMFS/px4fmu_common/init.d/3031_phantom index 24372bddc..d05c3174f 100644 --- a/ROMFS/px4fmu_common/init.d/3031_phantom +++ b/ROMFS/px4fmu_common/init.d/3031_phantom @@ -37,3 +37,7 @@ then fi set MIXER FMU_Q + +# Provide ESC a constant 1000 us pulse +set PWM_OUTPUTS 4 +set PWM_DISARMED 1000 diff --git a/ROMFS/px4fmu_common/init.d/rc.usb b/ROMFS/px4fmu_common/init.d/rc.usb index d6e638c0a..1f8d8b862 100644 --- a/ROMFS/px4fmu_common/init.d/rc.usb +++ b/ROMFS/px4fmu_common/init.d/rc.usb @@ -3,7 +3,7 @@ # USB MAVLink start # -mavlink start -r 10000 -d /dev/ttyACM0 +mavlink start -r 10000 -d /dev/ttyACM0 -x # Enable a number of interesting streams we want via USB mavlink stream -d /dev/ttyACM0 -s NAMED_VALUE_FLOAT -r 10 usleep 100000 diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 6d06f897a..f70e0ed77 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -428,11 +428,10 @@ then # sh /etc/init.d/rc.sensors - if [ $HIL == no ] - then - echo "[init] Start logging" - sh /etc/init.d/rc.logging - fi + # + # Start logging in all modes, including HIL + # + sh /etc/init.d/rc.logging if [ $GPS == yes ] then |