diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-01 19:03:45 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-01 19:03:45 +0100 |
| commit | dd7c198268836b06119a6127601a93cf152f288e (patch) | |
| tree | 7d1b06e3c23cc49724cba5b94531a5c27a8812f2 /ROMFS/px4fmu_common | |
| parent | aa5d8a8732b1bed690360c25d725f2c13458528a (diff) | |
| parent | e1356f69b4a0c6c5cc8eaacb83f7c2791406d747 (diff) | |
| download | px4-firmware-dd7c198268836b06119a6127601a93cf152f288e.tar.gz px4-firmware-dd7c198268836b06119a6127601a93cf152f288e.tar.bz2 px4-firmware-dd7c198268836b06119a6127601a93cf152f288e.zip | |
Merged master into beta
Diffstat (limited to 'ROMFS/px4fmu_common')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.autostart | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/mixers/FMU_Q.mix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.autostart b/ROMFS/px4fmu_common/init.d/rc.autostart index 8d2fc5772..e39aa4617 100644 --- a/ROMFS/px4fmu_common/init.d/rc.autostart +++ b/ROMFS/px4fmu_common/init.d/rc.autostart @@ -23,7 +23,7 @@ if param compare SYS_AUTOSTART 1000 then - #sh /etc/init.d/1000_rc_fw_easystar.hil + sh /etc/init.d/1000_rc_fw_easystar.hil fi if param compare SYS_AUTOSTART 1001 diff --git a/ROMFS/px4fmu_common/mixers/FMU_Q.mix b/ROMFS/px4fmu_common/mixers/FMU_Q.mix index 17ff71151..b8ecbc879 100644 --- a/ROMFS/px4fmu_common/mixers/FMU_Q.mix +++ b/ROMFS/px4fmu_common/mixers/FMU_Q.mix @@ -25,13 +25,13 @@ for the elevons. M: 2 O: 10000 10000 0 -10000 10000 -S: 0 0 -5000 -8000 0 -10000 10000 -S: 0 1 8000 8000 0 -10000 10000 +S: 0 0 -8000 -8000 0 -10000 10000 +S: 0 1 6000 6000 0 -10000 10000 M: 2 O: 10000 10000 0 -10000 10000 -S: 0 0 -8000 -5000 0 -10000 10000 -S: 0 1 -8000 -8000 0 -10000 10000 +S: 0 0 -8000 -8000 0 -10000 10000 +S: 0 1 -6000 -6000 0 -10000 10000 Output 2 -------- |