Browse Source

Merged master into beta

sbg
Lorenz Meier 11 years ago
parent
commit
dd7c198268
  1. 2
      ROMFS/px4fmu_common/init.d/rc.autostart
  2. 8
      ROMFS/px4fmu_common/mixers/FMU_Q.mix
  3. 2
      src/modules/commander/commander.cpp
  4. 4
      src/systemcmds/mtd/mtd.c

2
ROMFS/px4fmu_common/init.d/rc.autostart

@ -23,7 +23,7 @@
if param compare SYS_AUTOSTART 1000 if param compare SYS_AUTOSTART 1000
then then
#sh /etc/init.d/1000_rc_fw_easystar.hil sh /etc/init.d/1000_rc_fw_easystar.hil
fi fi
if param compare SYS_AUTOSTART 1001 if param compare SYS_AUTOSTART 1001

8
ROMFS/px4fmu_common/mixers/FMU_Q.mix

@ -25,13 +25,13 @@ for the elevons.
M: 2 M: 2
O: 10000 10000 0 -10000 10000 O: 10000 10000 0 -10000 10000
S: 0 0 -5000 -8000 0 -10000 10000 S: 0 0 -8000 -8000 0 -10000 10000
S: 0 1 8000 8000 0 -10000 10000 S: 0 1 6000 6000 0 -10000 10000
M: 2 M: 2
O: 10000 10000 0 -10000 10000 O: 10000 10000 0 -10000 10000
S: 0 0 -8000 -5000 0 -10000 10000 S: 0 0 -8000 -8000 0 -10000 10000
S: 0 1 -8000 -8000 0 -10000 10000 S: 0 1 -6000 -6000 0 -10000 10000
Output 2 Output 2
-------- --------

2
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 */ /* main mode switch */
if (!isfinite(sp_man->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; status->mode_switch = MODE_SWITCH_MANUAL;
} else if (sp_man->mode_switch > STICK_ON_OFF_LIMIT) { } else if (sp_man->mode_switch > STICK_ON_OFF_LIMIT) {

4
src/systemcmds/mtd/mtd.c

@ -257,7 +257,6 @@ mtd_start(char *partition_names[], unsigned n_partitions)
/* Now create MTD FLASH partitions */ /* Now create MTD FLASH partitions */
warnx("Creating partitions");
FAR struct mtd_dev_s *part[n_partitions]; FAR struct mtd_dev_s *part[n_partitions];
char blockname[32]; 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++) { 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 */ /* Create the partition */
part[i] = mtd_partition(mtd_dev, offset, nblocks); part[i] = mtd_partition(mtd_dev, offset, nblocks);

Loading…
Cancel
Save