fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-15 04:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

mixers: Multirotor remove text roll, pitch, yaw scaling and idle speed

Browse Source
This commit is contained in:
Daniel Agar
2020-08-17 16:37:08 -04:00
parent 4afb27411c
commit 26bac78eaf
46 changed files with 51 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/px4fmu_common/init.d/airframes/4080_zmr250
+1 -1
View File
@@ -14,7 +14,7 @@
sh /etc/init.d/rc.mc_defaults
set MIXER zmr250
set MIXER quad_x
set PWM_OUT 1234
if [ $AUTOCNF = yes ]
ROMFS/px4fmu_common/mixers-sitl/quad_x_vtol.main.mix
+1 -1
View File
@@ -1,7 +1,7 @@
Mixer for the gazebo tailsitter model
=====================================
R: 4x 10000 10000 10000 0
R: 4x
Z:
ROMFS/px4fmu_common/mixers-sitl/standard_vtol_sitl.main.mix
+1 -1
View File
@@ -3,7 +3,7 @@ Mixer for standard vtol plane (SITL) with motor x configuration
This file defines a single mixer for a standard vtol plane (SITL gazebo) with motors in X configuration. The plane has two ailerons and one elevator.
R: 4x 10000 10000 10000 0
R: 4x
# mixer for the pusher/puller throttle
M: 1
ROMFS/px4fmu_common/mixers-sitl/tiltrotor_sitl.main.mix
+1 -1
View File
@@ -3,7 +3,7 @@ Mixer for quad tiltrotor (x motor configuration)
This file defines a single mixer for a tiltrotor (SITL gazebo) with motors in X configuration. The plane has two ailerons and one elevator.
R: 4x 10000 10000 10000 0
R: 4x
# tilt servo motor 1
M: 1
ROMFS/px4fmu_common/mixers/CMakeLists.txt
-2
View File
@@ -57,7 +57,6 @@ px4_add_romfs_files(
IO_pass.main.mix
mount.aux.mix
mount_legs.aux.mix
ocpoc_quad_x.main.mix
octo_cox.main.mix
octo_cox_w.main.mix
octo_+.main.mix
@@ -84,7 +83,6 @@ px4_add_romfs_files(
vtol_convergence.main.mix
vtol_delta.aux.mix
wingwing.main.mix
zmr250.main.mix
TF-AutoG2.main.mix
uuv_x.main.mix
)
ROMFS/px4fmu_common/mixers/babyshark.main.mix
+1 -1
View File
@@ -35,4 +35,4 @@ S: 1 1 -8000 -8000 0 -10000 10000
Quad motors 1 - 4
-----------------
R: 4x 10000 10000 10000 0
R: 4x
ROMFS/px4fmu_common/mixers/claire.main.mix
+1 -1
View File
@@ -4,4 +4,4 @@
#===========================
R: 4x 10000 10000 10000 0
R: 4x
ROMFS/px4fmu_common/mixers/deltaquad.main.mix
+1 -1
View File
@@ -4,7 +4,7 @@
Quad motors 1 - 4
-------------
R: 4x 10000 10000 10000 0
R: 4x
Elevon mixers
ROMFS/px4fmu_common/mixers/dodeca_bottom_cox.aux.mix
+1 -1
View File
@@ -1,3 +1,3 @@
# Dodeca Cox
R: 6a 10000 10000 10000 0
R: 6a
ROMFS/px4fmu_common/mixers/dodeca_top_cox.main.mix
+1 -1
View File
@@ -1,3 +1,3 @@
# Dodeca Cox
R: 6m 10000 10000 10000 0
R: 6m
ROMFS/px4fmu_common/mixers/firefly6.main.mix
+1 -1
View File
@@ -1,4 +1,4 @@
# FireFly6 mixer for PX4FMU
#
#===========================
R: 6c 10000 10000 10000 0
R: 6c
ROMFS/px4fmu_common/mixers/hexa_+.main.mix
+1 -1
View File
@@ -1,3 +1,3 @@
# Hexa +
R: 6+ 10000 10000 10000 0
R: 6+
ROMFS/px4fmu_common/mixers/hexa_cox.main.mix
+1 -1
View File
@@ -1,3 +1,3 @@
# Hexa coaxial
R: 6c 10000 10000 10000 0
R: 6c
ROMFS/px4fmu_common/mixers/hexa_x.main.mix
+1 -1
View File
@@ -1,4 +1,4 @@
# Hexa X
R: 6x 10000 10000 10000 0
R: 6x
ROMFS/px4fmu_common/mixers/ocpoc_quad_x.main.mix
-1
View File
@@ -1 +0,0 @@
R: 4x 10000 10000 10000 1300
ROMFS/px4fmu_common/mixers/octo_+.main.mix
+1 -1
View File
@@ -1,3 +1,3 @@
# Octo +
R: 8+ 10000 10000 10000 0
R: 8+
ROMFS/px4fmu_common/mixers/octo_cox.main.mix
+1 -1
View File
@@ -1,3 +1,3 @@
# Octo coaxial
R: 8c 10000 10000 10000 0
R: 8c
ROMFS/px4fmu_common/mixers/octo_cox_w.main.mix
+1 -1
View File
@@ -1,3 +1,3 @@
# Octo coaxial with wide arms
R: 8cw 10000 10000 10000 0
R: 8cw
ROMFS/px4fmu_common/mixers/octo_x.main.mix
+1 -1
View File
@@ -1,3 +1,3 @@
# Octo X
R: 8x 10000 10000 10000 0
R: 8x
ROMFS/px4fmu_common/mixers/quad_+.main.mix
+1 -1
View File
@@ -4,7 +4,7 @@ Multirotor mixer for PX4FMU
This file defines a single mixer for a quadrotor in the + configuration. All controls
are mixed 100%.
R: 4+ 10000 10000 10000 0
R: 4+
Gimbal / payload mixer for last two channels
-----------------------------------------------------
ROMFS/px4fmu_common/mixers/quad_+_vtol.main.mix
+1 -1
View File
@@ -4,7 +4,7 @@ Mixer for Tailsitter with + motor configuration and elevons
This file defines a single mixer for tailsitter with motors in X configuration. All controls
are mixed 100%.
R: 4+ 10000 10000 10000 0
R: 4+
# mixer for the elevons
M: 2
ROMFS/px4fmu_common/mixers/quad_dc.main.mix
+1 -1
View File
@@ -3,4 +3,4 @@ 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
R: 4dc
ROMFS/px4fmu_common/mixers/quad_h.main.mix
+1 -1
View File
@@ -4,7 +4,7 @@ Multirotor mixer for PX4FMU
This file defines a single mixer for a quadrotor in the H configuration. All controls
are mixed 100%.
R: 4h 10000 10000 10000 0
R: 4h
Gimbal / payload mixer for last two channels
-----------------------------------------------------
ROMFS/px4fmu_common/mixers/quad_s250aq.main.mix
+1 -1
View File
@@ -1,4 +1,4 @@
R: 4s 10000 10000 10000 0
R: 4s
M: 1
S: 3 5 10000 10000 0 -10000 10000
M: 1
ROMFS/px4fmu_common/mixers/quad_w.main.mix
+1 -1
View File
@@ -3,7 +3,7 @@ Multirotor mixer for PX4FMU
This file defines a single mixer for a quadrotor with a wide configuration. All controls are mixed 100%.
R: 4w 10000 10000 10000 0
R: 4w
Gimbal / payload mixer for last two channels
-----------------------------------------------------
ROMFS/px4fmu_common/mixers/quad_x.main.mix
+1 -1
View File
@@ -1,4 +1,4 @@
R: 4x 10000 10000 10000 0
R: 4x
AUX1 Passthrough
M: 1
ROMFS/px4fmu_common/mixers/quad_x_cw.main.mix
+1 -1
View File
@@ -1,4 +1,4 @@
# @board px4_fmu-v2 exclude
# Quad X with clock-wise motor assigment
R: 4xcw 10000 10000 10000 0
R: 4xcw
ROMFS/px4fmu_common/mixers/quad_x_vtol.main.mix
+1 -1
View File
@@ -4,7 +4,7 @@ Mixer for Tailsitter with x motor configuration and elevons
This file defines a single mixer for tailsitter with motors in X configuration. All controls
are mixed 100%.
R: 4x 10000 10000 10000 0
R: 4x
# left elevon
M: 2
ROMFS/px4fmu_common/mixers/standard_vtol_hitl.main.mix
+1 -1
View File
@@ -3,7 +3,7 @@ Mixer for Standard VTOL (QuadPlane) with motor x configuration (Gazebo HITL)
# @board px4_fmu-v2 exclude
R: 4x 10000 10000 10000 0
R: 4x
# mixer for the pusher/puller throttle
M: 1
ROMFS/px4fmu_common/mixers/tri_y_yaw+.main.mix
+1 -1
View File
@@ -4,7 +4,7 @@
# Yaw Servo +Output ==> +Yaw Vehicle Rotation
# Motors
R: 3y 10000 10000 10000 0
R: 3y
# Yaw Servo
M: 1
ROMFS/px4fmu_common/mixers/tri_y_yaw-.main.mix
+1 -1
View File
@@ -4,7 +4,7 @@
# Yaw Servo +Output ==> -Yaw Vehicle Rotation
# Motors
R: 3y 10000 10000 10000 0
R: 3y
# Yaw Servo
M: 1
ROMFS/px4fmu_common/mixers/vtol_convergence.main.mix
+1 -1
View File
@@ -1,7 +1,7 @@
# E-flite Convergence Tricopter Y-Configuration Mixer
# Motors
R: 3y 10000 10000 10000 0
R: 3y
Z:
ROMFS/px4fmu_common/mixers/vtol_tailsitter_duo.main.mix
+1 -1
View File
@@ -13,7 +13,7 @@ Motor mixer
Channel 1 connects to the right (starboard) motor.
Channel 2 connects to the left (port) motor.
R: 2- 10000 10000 10000 0
R: 2-
Zero mixer (2x)
---------------
ROMFS/px4fmu_common/mixers/zmr250.main.mix
-11
View File
@@ -1,11 +0,0 @@
#
# @board px4_fmu-v2 exclude
#
# R: <geometry> <roll scale> <pitch scale> <yaw scale> <deadband>
R: 4x 7654 10000 10000 0
M: 1
S: 0 4 10000 10000 0 -10000 10000
M: 1
S: 0 5 10000 10000 0 -10000 10000
ROMFS/px4fmu_test/mixers/hexa_x.main.mix
+1 -1
View File
@@ -1,4 +1,4 @@
# Hexa X
R: 6x 10000 10000 10000 0
R: 6x
ROMFS/px4fmu_test/mixers/octo_x.main.mix
+1 -1
View File
@@ -1,3 +1,3 @@
# Octo X
R: 8x 10000 10000 10000 0
R: 8x
ROMFS/px4fmu_test/mixers/quad_+.main.mix
+1 -1
View File
@@ -4,7 +4,7 @@ Multirotor mixer for PX4FMU
This file defines a single mixer for a quadrotor in the + configuration. All controls
are mixed 100%.
R: 4+ 10000 10000 10000 0
R: 4+
Gimbal / payload mixer for last two channels
-----------------------------------------------------
ROMFS/px4fmu_test/mixers/quad_+_vtol.main.mix
+1 -1
View File
@@ -4,7 +4,7 @@ Mixer for Tailsitter with + motor configuration and elevons
This file defines a single mixer for tailsitter with motors in X configuration. All controls
are mixed 100%.
R: 4+ 10000 10000 10000 0
R: 4+
# mixer for the elevons
M: 2
ROMFS/px4fmu_test/mixers/quad_test.mix
+1 -1
View File
@@ -3,7 +3,7 @@ Multirotor mixer for TEST
This file defines a single mixer for a quadrotor with a wide configuration. All controls are mixed 100%.
R: 4w 10000 10000 10000 0
R: 4w
Gimbal / payload mixer for last four channels
-----------------------------------------------------
ROMFS/px4fmu_test/mixers/quad_x.main.mix
+1 -1
View File
@@ -1,4 +1,4 @@
R: 4x 10000 10000 10000 0
R: 4x
M: 1
O: 10000 10000 0 -10000 10000
S: 3 5 10000 10000 0 -10000 10000
ROMFS/px4fmu_test/mixers/vtol1_test.mix
+1 -1
View File
@@ -1,6 +1,6 @@
# VTOL test mixer
R: 2- 10000 10000 10000 0
R: 2-
Z:
M: 2
O: 10000 10000 0 -10000 10000
ROMFS/px4fmu_test/mixers/vtol2_test.mix
+1 -1
View File
@@ -1,7 +1,7 @@
# E-flite Convergence Tricopter Y-Configuration Mixer
# Motors
R: 3y 10000 10000 10000 0
R: 3y
Z:
ROMFS/px4fmu_test/mixers/vtol_convergence.main.mix
+1 -1
View File
@@ -1,7 +1,7 @@
# E-flite Convergence Tricopter Y-Configuration Mixer
# Motors
R: 3y 10000 10000 10000 0
R: 3y
Z: