diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-22 21:50:25 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-22 21:50:25 +0100 |
| commit | 46dd95ab349987fcb6f788e88d61dce56c17e21f (patch) | |
| tree | d0ad9fbd08ba07f6aca46395419835fb85cf507b /ROMFS/px4fmu_common/init.d | |
| parent | 6dd98cb3118d7d08bbf01b58737dcdc53b429e1b (diff) | |
| parent | d54b46355ce0f8c128a5e7fce94564c7cb338987 (diff) | |
| download | px4-firmware-46dd95ab349987fcb6f788e88d61dce56c17e21f.tar.gz px4-firmware-46dd95ab349987fcb6f788e88d61dce56c17e21f.tar.bz2 px4-firmware-46dd95ab349987fcb6f788e88d61dce56c17e21f.zip | |
Merge branch 'master' of github.com:PX4/Firmware into isvtol
Diffstat (limited to 'ROMFS/px4fmu_common/init.d')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol | 6 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.vtol_defaults | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol b/ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol index bff971c0f..7e9a6d3dc 100644 --- a/ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol +++ b/ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol @@ -9,8 +9,8 @@ sh /etc/init.d/rc.vtol_defaults set MIXER FMU_caipirinha_vtol -set PWM_OUTPUTS 12 +set PWM_OUT 12 set PWM_MAX 2000 set PWM_RATE 400 -param set VTOL_MOT_COUNT 2 -param set IDLE_PWM_MC 1080 +param set VT_MOT_COUNT 2 +param set VT_IDLE_PWM_MC 1080 diff --git a/ROMFS/px4fmu_common/init.d/rc.vtol_defaults b/ROMFS/px4fmu_common/init.d/rc.vtol_defaults index 10ee5db9b..6dc5a65db 100644 --- a/ROMFS/px4fmu_common/init.d/rc.vtol_defaults +++ b/ROMFS/px4fmu_common/init.d/rc.vtol_defaults @@ -2,7 +2,7 @@ set VEHICLE_TYPE vtol -if [ $DO_AUTOCONFIG == yes ] +if [ $AUTOCNF == yes ] then # #Default controller parameters for MC diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 5748fe2b5..14fc8d2b4 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -584,7 +584,7 @@ then sh /etc/init.d/rc.interface # Start standard vtol apps - if [ $LOAD_DEFAULT_APPS == yes ] + if [ $LOAD_DAPPS == yes ] then sh /etc/init.d/rc.vtol_apps fi |