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 | |
| 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
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.autostart | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/mixers/FMU_Q.mix | 8 | ||||
| -rw-r--r-- | src/modules/commander/commander.cpp | 2 | ||||
| -rw-r--r-- | src/systemcmds/mtd/mtd.c | 4 |
4 files changed, 6 insertions, 10 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 -------- diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index aca3f6256..40117b7a1 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -1475,7 +1475,7 @@ check_mode_switches(struct manual_control_setpoint_s *sp_man, struct vehicle_sta { /* main mode switch */ if (!isfinite(sp_man->mode_switch)) { - warnx("mode sw not finite"); + /* default to manual if signal is invalid */ status->mode_switch = MODE_SWITCH_MANUAL; } else if (sp_man->mode_switch > STICK_ON_OFF_LIMIT) { diff --git a/src/systemcmds/mtd/mtd.c b/src/systemcmds/mtd/mtd.c index a2a0c109c..0a88d40f3 100644 --- a/src/systemcmds/mtd/mtd.c +++ b/src/systemcmds/mtd/mtd.c @@ -257,7 +257,6 @@ mtd_start(char *partition_names[], unsigned n_partitions) /* Now create MTD FLASH partitions */ - warnx("Creating partitions"); FAR struct mtd_dev_s *part[n_partitions]; char blockname[32]; @@ -266,9 +265,6 @@ mtd_start(char *partition_names[], unsigned n_partitions) for (offset = 0, i = 0; i < n_partitions; offset += nblocks, i++) { - warnx(" Partition %d. Block offset=%lu, size=%lu", - i, (unsigned long)offset, (unsigned long)nblocks); - /* Create the partition */ part[i] = mtd_partition(mtd_dev, offset, nblocks); |