yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed naming of the mixers to get rid of umbiguity as outputs are actually going to be driven by io, not fmu

Browse Source 
Implemented automatic lookup for the .aux.mix file if it exists
This commit is contained in:
Anton Matosov
2015-01-07 00:25:06 +02:00
parent 74b63d08e1
commit 08062e6546
56 changed files with 81 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ROMFS/px4fmu_common/init.d/rcS
View File

@@ -116,7 +116,7 @@ then
set HIL no
set VEHICLE_TYPE none
set MIXER none
set MIXER_SEC none
set MIXER_AUX none
set OUTPUT_MODE none
set PWM_OUT none
set PWM_RATE none
@@ -482,7 +482,7 @@ then
if [ $MIXER == none ]
then
# Set default mixer for fixed wing if not defined
set MIXER FMU_AERT
set MIXER AERT
fi
if [ $MAV_TYPE == none ]
@@ -518,27 +518,27 @@ then
if [ $MAV_TYPE == none ]
then
# Use mixer to detect vehicle type
if [ $MIXER == FMU_quad_x -o $MIXER == FMU_quad_+ ]
if [ $MIXER == quad_x -o $MIXER == quad_+ ]
then
set MAV_TYPE 2
fi
if [ $MIXER == FMU_quad_w ]
if [ $MIXER == quad_w ]
then
set MAV_TYPE 2
fi
if [ $MIXER == FMU_hexa_x -o $MIXER == FMU_hexa_+ ]
if [ $MIXER == hexa_x -o $MIXER == hexa_+ ]
then
set MAV_TYPE 13
fi
if [ $MIXER == FMU_hexa_cox ]
if [ $MIXER == hexa_cox ]
then
set MAV_TYPE 13
fi
if [ $MIXER == FMU_octo_x -o $MIXER == FMU_octo_+ ]
if [ $MIXER == octo_x -o $MIXER == octo_+ ]
then
set MAV_TYPE 14
fi
if [ $MIXER == FMU_octo_cox ]
if [ $MIXER == octo_cox ]
then
set MAV_TYPE 14
fi
@@ -577,11 +577,11 @@ then
if [ $MAV_TYPE == none ]
then
# Use mixer to detect vehicle type
if [ $MIXER == FMU_caipirinha_vtol ]
if [ $MIXER == caipirinha_vtol ]
then
set MAV_TYPE 19
fi
if [ $MIXER == FMU_firefly6_rotors ]
if [ $MIXER == firefly6_rotors ]
then
set MAV_TYPE 21
fi