diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2015-04-27 22:34:08 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-04-27 22:34:08 +0200 |
commit | 3dd45b9d3467ee62ac0d604a5607baaa10089ac3 (patch) | |
tree | 7bf56e57c71bcfedc47a7af9be4bab290beb21da /ROMFS | |
parent | 7b06d781d8ade137a1837a3ecf002579bddfbb14 (diff) | |
parent | bd1c3363df44170523c68fd87ee19f2582a5e8fc (diff) | |
download | px4-firmware-beta.tar.gz px4-firmware-beta.tar.bz2 px4-firmware-beta.zip |
Merge branch 'master' into betabeta
Diffstat (limited to 'ROMFS')
-rw-r--r-- | ROMFS/px4fmu_common/init.d/13002_firefly6 | 2 | ||||
-rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.io | 7 | ||||
-rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.usb | 2 | ||||
-rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 14 |
4 files changed, 11 insertions, 14 deletions
diff --git a/ROMFS/px4fmu_common/init.d/13002_firefly6 b/ROMFS/px4fmu_common/init.d/13002_firefly6 index a20ca04df..191c58da4 100644 --- a/ROMFS/px4fmu_common/init.d/13002_firefly6 +++ b/ROMFS/px4fmu_common/init.d/13002_firefly6 @@ -17,5 +17,7 @@ set PWM_AUX_DISARMED 1000 set PWM_AUX_MIN 1000 set PWM_AUX_MAX 2000 +set MAV_TYPE 21 + param set VT_MOT_COUNT 6 param set VT_IDLE_PWM_MC 1080 diff --git a/ROMFS/px4fmu_common/init.d/rc.io b/ROMFS/px4fmu_common/init.d/rc.io index e957626ce..86042220e 100644 --- a/ROMFS/px4fmu_common/init.d/rc.io +++ b/ROMFS/px4fmu_common/init.d/rc.io @@ -16,5 +16,8 @@ then set PX4IO_LIMIT 200 fi -echo "[i] Set PX4IO update rate limit: $PX4IO_LIMIT Hz" -px4io limit $PX4IO_LIMIT +if px4io limit $PX4IO_LIMIT +then +else + echo "[i] Set PX4IO update rate to $PX4IO_LIMIT Hz failed!" +fi diff --git a/ROMFS/px4fmu_common/init.d/rc.usb b/ROMFS/px4fmu_common/init.d/rc.usb index fddcf5b3e..e456eff7f 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 20000 -d /dev/ttyACM0 -x +mavlink start -r 30000 -d /dev/ttyACM0 -x # Enable a number of interesting streams we want via USB mavlink stream -d /dev/ttyACM0 -s PARAM_VALUE -r 200 mavlink stream -d /dev/ttyACM0 -s MISSION_ITEM -r 50 diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index e2b247a76..1237d9bb1 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -24,7 +24,6 @@ set LOG_FILE /fs/microsd/bootlog.txt # Try to mount the microSD card. # # REBOOTWORK this needs to start after the flight control loop -echo "[i] Looking for microSD..." if mount -t vfat /dev/mmcsd0 /fs/microsd then echo "[i] microSD mounted: /fs/microsd" @@ -53,11 +52,9 @@ fi # if [ -f $FRC ] then - echo "[i] Executing init script: $FRC" + echo "[i] Executing script: $FRC" sh $FRC set MODE custom -else - echo "[i] Init script not found: $FRC" fi unset FRC @@ -126,6 +123,7 @@ then set PWM_AUX_DISARMED none set PWM_AUX_MIN none set PWM_AUX_MAX none + set FAILSAFE_AUX none set MK_MODE none set FMU_MODE pwm set MAVLINK_F default @@ -174,10 +172,8 @@ then # if [ -f $FCONFIG ] then - echo "[i] Config: $FCONFIG" + echo "[i] Custom config: $FCONFIG" sh $FCONFIG - else - echo "[i] Config not found: $FCONFIG" fi unset FCONFIG @@ -330,10 +326,8 @@ then then if px4io start then - echo "[i] PX4IO started" sh /etc/init.d/rc.io else - echo "[i] ERROR: PX4IO start failed" tone_alarm $TUNE_ERR fi fi @@ -681,8 +675,6 @@ then then echo "[i] Addons script: $FEXTRAS" sh $FEXTRAS - else - echo "[i] No addons script: $FEXTRAS" fi unset FEXTRAS |