dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Fix usage of Iris mixer, make space by deleting unused files

This commit is contained in:
Lorenz Meier 2016-12-18 01:46:59 +01:00 committed by Lorenz Meier
parent 92c35f26be
commit 6b0ac296b6
5 changed files with 26 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ROMFS/px4fmu_common/init.d/10016_3dr_iris
View File

@ -29,6 +29,6 @@ then
param set BAT_A_PER_V 15.39103
fi
set MIXER quad_w
set MIXER dc
set PWM_OUT 1234

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

@ -4,6 +4,24 @@
#
# NOTE: COMMENT LINES ARE REMOVED BEFORE STORED IN ROMFS.
#
# UART mapping on FMUv1/2/3/4:
#
# UART1 /dev/ttyS0 IO debug
# USART2 /dev/ttyS1 TELEM1 (flow control)
# USART3 /dev/ttyS2 TELEM2 (flow control)
# UART4
# UART
#
#
# UART mapping on FMUv5:
#
# UART1 /dev/ttyS0 GPS
# USART2 /dev/ttyS1 TELEM1 (flow control)
# USART3 /dev/ttyS2 TELEM2 (flow control)
# UART4 /dev/ttyS3 ?
# USART6 /dev/ttyS4 TELEM3 (flow control)
# UART7 /dev/ttyS5 ?
# UART8 /dev/ttyS6 CONSOLE
#
# Start CDC/ACM serial driver
@ -792,7 +810,7 @@ then
then
set MAV_TYPE 2
fi
if [ $MIXER == quad_w -o $MIXER == sk450_deadcat ]
if [ $MIXER == quad_w -o $MIXER == quad_dc ]
then
set MAV_TYPE 2
fi

6
ROMFS/px4fmu_common/mixers/quad_dc.main.mix Normal file
View File

@ -0,0 +1,6 @@
Multirotor mixer
===========================
This file defines a single mixer for a quadrotor in DC wide arms configuration. All controls are mixed 100%.
R: 4dc 10000 10000 10000 0

38
ROMFS/px4fmu_common/mixers/sk450_deadcat.aux.mix
View File

@ -1,38 +0,0 @@
Gimbal / payload mixer for PX4FMU
===========================
Configuration with 2 gimbals:
- 2 axes inline GoPro gimbal (pitch, roll)
- 2 axes FPV gimbal (pitch, yaw), physically attached GoPro gimbal's roll stabilization
-----------------------------------------------------
# gimbal roll
M: 1
O: 10000 10000 0 -10000 10000
S: 2 0 -11500 -10000 900 -10000 10000
# gimbal pitch
M: 1
O: 10000 10000 0 -10000 10000
S: 2 1 12000 12000 2000 -10000 10000
# FPV gimbal yaw (not implemented, yet)
M: 1
O: 10000 10000 0 -10000 10000
S: 2 2 10000 10000 0 -10000 10000
# FPV gimbal pitch
M: 1
O: 10000 10000 0 -10000 10000
S: 2 1 -12000 -12000 -3000 -10000 10000
# reserved, not used
M: 1
O: 10000 10000 0 -10000 10000
S: 2 4 10000 10000 0 -10000 10000
# parachute
M: 1
O: 10000 10000 0 -10000 10000
S: 2 7 10000 10000 0 -10000 10000

21
ROMFS/px4fmu_common/mixers/sk450_deadcat.main.mix
View File

@ -1,21 +0,0 @@
Multirotor mixer for PX4IO
===========================
This file defines a single mixer for a quadrotor in SK450 DeadCat configuration. All controls are mixed 100%.
R: 4dc 10000 10000 10000 0
Gimbal / payload mixer for last three channels
-----------------------------------------------------
M: 1
O: 10000 10000 0 -10000 10000
S: 3 5 10000 10000 0 -10000 10000
M: 1
O: 10000 10000 0 -10000 10000
S: 3 6 10000 10000 0 -10000 10000
M: 1
O: 10000 10000 0 -10000 10000
S: 3 7 10000 10000 0 -10000 10000