From e027bf22133ff20fdb2a877880e1b9ec5c7d8533 Mon Sep 17 00:00:00 2001 From: Roman Bapst Date: Tue, 2 Dec 2014 11:02:23 +0100 Subject: removed remainings of quadshot for now --- ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol | 4 ++-- ROMFS/px4fmu_common/init.d/rc.autostart | 8 +------- ROMFS/px4fmu_common/init.d/rcS | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) (limited to 'ROMFS/px4fmu_common') diff --git a/ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol b/ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol index c8b095b3c..3e1aa1643 100644 --- a/ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol +++ b/ROMFS/px4fmu_common/init.d/13001_caipirinha_vtol @@ -1,6 +1,6 @@ #!nsh # -# Generic quadshot configuration file +# Generic configuration file for caipirinha VTOL version # # Roman Bapst # @@ -9,6 +9,6 @@ sh /etc/init.d/rc.vtol_defaults set MIXER FMU_caipirinha_vtol -set PWM_OUTPUTS 12 +set PWM_OUTPUTS 2 set PWM_MIN 1080 set PWM_MAX 2000 diff --git a/ROMFS/px4fmu_common/init.d/rc.autostart b/ROMFS/px4fmu_common/init.d/rc.autostart index 331ff4974..19fce6ea5 100644 --- a/ROMFS/px4fmu_common/init.d/rc.autostart +++ b/ROMFS/px4fmu_common/init.d/rc.autostart @@ -239,13 +239,7 @@ then sh /etc/init.d/12001_octo_cox fi -# -# VTOL quadshot -# - if param compare SYS_AUTOSTART 13000 - then - sh /etc/init.d/13000_quadshot - fi +# 13000 is historically reserved for the quadshot # # VTOL caipririnha diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index ffef598c4..8741f5ee0 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -561,9 +561,9 @@ then if [ $MAV_TYPE == none ] then # Use mixer to detect vehicle type - if [ $MIXER == FMU_quadshot ] + if [ $MIXER == FMU_caipirinha_vtol ] then - set MAV_TYPE 20 + set MAV_TYPE 19 fi fi -- cgit v1.2.3