removed remainings of quadshot for now

This commit is contained in:
Roman Bapst 2014-12-02 11:02:23 +01:00
parent 887ed69099
commit e027bf2213
3 changed files with 5 additions and 11 deletions

View File

@ -1,6 +1,6 @@
#!nsh #!nsh
# #
# Generic quadshot configuration file # Generic configuration file for caipirinha VTOL version
# #
# Roman Bapst <bapstr@ethz.ch> # Roman Bapst <bapstr@ethz.ch>
# #
@ -9,6 +9,6 @@ sh /etc/init.d/rc.vtol_defaults
set MIXER FMU_caipirinha_vtol set MIXER FMU_caipirinha_vtol
set PWM_OUTPUTS 12 set PWM_OUTPUTS 2
set PWM_MIN 1080 set PWM_MIN 1080
set PWM_MAX 2000 set PWM_MAX 2000

View File

@ -239,13 +239,7 @@ then
sh /etc/init.d/12001_octo_cox sh /etc/init.d/12001_octo_cox
fi fi
# # 13000 is historically reserved for the quadshot
# VTOL quadshot
#
if param compare SYS_AUTOSTART 13000
then
sh /etc/init.d/13000_quadshot
fi
# #
# VTOL caipririnha # VTOL caipririnha

View File

@ -561,9 +561,9 @@ then
if [ $MAV_TYPE == none ] if [ $MAV_TYPE == none ]
then then
# Use mixer to detect vehicle type # Use mixer to detect vehicle type
if [ $MIXER == FMU_quadshot ] if [ $MIXER == FMU_caipirinha_vtol ]
then then
set MAV_TYPE 20 set MAV_TYPE 19
fi fi
fi fi