fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-12 19:07:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from ethz-asl/pr-upstream-merge

Browse Source 
16/02/2021 Upstream Merge
This commit is contained in:
JaeyoungLim
2021-02-23 09:43:53 +01:00
committed by GitHub
parent c25e7e2362 44df0fb7a2
commit 472e191fef
115 changed files with 2438 additions and 3104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/px4fmu_common/init.d-posix/airframes/1060_rover
+1 -1
View File
@@ -8,6 +8,7 @@
if [ $AUTOCNF = yes ]
then
param set GND_L1_DIST 5
param set GND_L1_PERIOD 10
param set GND_SP_CTRL_MODE 1
param set GND_SPEED_D 0.001
param set GND_SPEED_I 3
@@ -16,7 +17,6 @@ then
param set GND_SPEED_THR_SC 1
param set GND_SPEED_TRIM 4
param set GND_THR_CRUISE 0.3
param set GND_THR_IDLE 0
param set GND_THR_MAX 0.5
param set GND_THR_MIN 0
ROMFS/px4fmu_common/init.d-posix/airframes/1061_r1_rover
-1
View File
@@ -17,7 +17,6 @@ then
param set GND_SPEED_THR_SC 1
param set GND_SPEED_TRIM 4
param set GND_THR_CRUISE 0.3
param set GND_THR_IDLE 0
param set GND_THR_MAX 0.5
param set GND_THR_MIN 0
ROMFS/px4fmu_common/init.d-posix/airframes/1062_tf-r1
-1
View File
@@ -22,7 +22,6 @@ then
param set GND_SPEED_TRIM 15
param set GND_SPEED_MAX 25
param set GND_THR_CRUISE 0.3
param set GND_THR_IDLE 0
param set GND_THR_MAX 0.5
param set GND_THR_MIN 0
ROMFS/px4fmu_common/init.d-posix/airframes/1070_boat
-1
View File
@@ -17,7 +17,6 @@ then
param set GND_SPEED_THR_SC 1
param set GND_SPEED_TRIM 1
param set GND_THR_CRUISE 0.85
param set GND_THR_IDLE 0
param set GND_THR_MAX 1
param set GND_THR_MIN 0
ROMFS/px4fmu_common/init.d/airframes/50000_generic_ground_vehicle
+3 -6
View File
@@ -27,21 +27,18 @@ param set-default FW_AIRSPD_MAX 3
param set-default FW_AIRSPD_MIN 0
param set-default FW_AIRSPD_TRIM 1
param set-default GND_L1_DIST 10
# Settings for a typical wheelbase 0f 0.3m
param set-default GND_L1_DIST 1
param set-default GND_L1_PERIOD 5
param set-default GND_SP_CTRL_MODE 1
param set-default GND_SPEED_P 0.25
param set-default GND_SPEED_I 3
param set-default GND_SPEED_D 0.001
param set-default GND_SPEED_IMAX 0.125
param set-default GND_SPEED_THR_SC 1
param set-default GND_THR_IDLE 0
param set-default GND_THR_CRUISE 0.3
param set-default GND_THR_MAX 0.5
param set-default GND_THR_MIN 0
param set-default GND_WR_P 2
param set-default GND_WR_I 0.9674
param set-default GND_WR_IMAX 0.1
param set-default GND_WR_D 1.2
param set-default MIS_LTRMIN_ALT 0.01
param set-default MIS_TAKEOFF_ALT 0.01
ROMFS/px4fmu_common/init.d/airframes/50003_aion_robotics_r1_rover
-1
View File
@@ -35,7 +35,6 @@ param set-default FW_AIRSPD_MAX 3
param set-default GND_SP_CTRL_MODE 1
param set-default GND_L1_DIST 5
param set-default GND_L1_PERIOD 3
param set-default GND_THR_IDLE 0
param set-default GND_THR_CRUISE 0.7
param set-default GND_THR_MAX 0.5
ROMFS/px4fmu_common/init.d/airframes/50004_nxpcup_car_dfrobot_gpx
-1
View File
@@ -32,7 +32,6 @@ param set-default FW_AIRSPD_MIN 0
param set-default FW_AIRSPD_TRIM 1
param set-default FW_AIRSPD_MAX 3
param set-default GND_THR_IDLE 0
param set-default GND_THR_CRUISE 0.3
param set-default GND_THR_MAX 0.5
ROMFS/px4fmu_common/init.d/rc.interface
+1 -22
View File
@@ -67,22 +67,6 @@ fi
#
if [ $OUTPUT_MODE != none ]
then
if [ $OUTPUT_MODE = mkblctrl ]
then
if [ $MKBLCTRL_MODE = x ]
then
set MKBLCTRL_ARG "-mkmode x"
fi
if [ $MKBLCTRL_MODE = + ]
then
set MKBLCTRL_ARG "-mkmode +"
fi
if ! mkblctrl $MKBLCTRL_ARG
then
tune_control play error
fi
fi
if [ $OUTPUT_MODE = hil -o $OUTPUT_MODE = sim ]
then
@@ -153,12 +137,7 @@ then
fi
fi
if [ $OUTPUT_MODE = mkblctrl ]
then
set OUTPUT_DEV /dev/mkblctrl0
else
set OUTPUT_DEV /dev/pwm_output0
fi
set OUTPUT_DEV /dev/pwm_output0
if [ $OUTPUT_MODE = uavcan_esc ]
then
ROMFS/px4fmu_common/init.d/rcS
-4
View File
@@ -37,8 +37,6 @@ set MIXER none
set MIXER_AUX none
set MIXER_FILE none
set MIXER_EXTRA none
set MK_MODE none
set MKBLCTRL_ARG ""
set OUTPUT_MODE none
set PARAM_FILE /fs/microsd/params
set PWM_OUT none
@@ -591,8 +589,6 @@ unset MAV_TYPE
unset MIXER
unset MIXER_AUX
unset MIXER_FILE
unset MK_MODE
unset MKBLCTRL_ARG
unset OUTPUT_MODE
unset PARAM_DEFAULTS_VER
unset PARAM_FILE
ROMFS/px4fmu_common/mixers-sitl/vectored6dof_sitl.main.mix
+16 -8
View File
@@ -1,32 +1,40 @@
# Motor 1
M: 2
M: 3
S: 0 2 -4000 -4000 0 -4000 +4000
S: 0 3 +4000 +4000 0 -4000 +4000
S: 0 4 -4000 -4000 0 -4000 +4000
# Motor 2
M: 2
M: 3
S: 0 2 +4000 +4000 0 -4000 +4000
S: 0 3 +4000 +4000 0 -4000 +4000
S: 0 4 +4000 +4000 0 -4000 +4000
# Motor 3
M: 2
M: 3
S: 0 2 -4000 -4000 0 -4000 +4000
S: 0 3 +4000 +4000 0 -4000 +4000
S: 0 4 +4000 +4000 0 -4000 +4000
# Motor 4
M: 2
M: 3
S: 0 2 +4000 +4000 0 -4000 +4000
S: 0 3 +4000 +4000 0 -4000 +4000
S: 0 4 -4000 -4000 0 -4000 +4000
# Motor 5
M: 2
M: 3
S: 0 0 -4000 -4000 0 -4000 +4000
S: 0 1 +4000 +4000 0 -4000 +4000
S: 0 5 -4000 -4000 0 -4000 +4000
# Motor 6
M: 2
M: 3
S: 0 0 -4000 -4000 0 -4000 +4000
S: 0 1 -4000 -4000 0 -4000 +4000
S: 0 5 +4000 +4000 0 -4000 +4000
# Motor 7
M: 2
M: 3
S: 0 0 +4000 +4000 0 -4000 +4000
S: 0 1 +4000 +4000 0 -4000 +4000
S: 0 5 +4000 +4000 0 -4000 +4000
# Motor 8
M: 2
M: 3
S: 0 0 +4000 +4000 0 -4000 +4000
S: 0 1 -4000 -4000 0 -4000 +4000
S: 0 5 -4000 -4000 0 -4000 +4000
ROMFS/px4fmu_common/mixers/rover_diff_and_servo.main.mix
+7 -4
View File
@@ -13,25 +13,28 @@ Inputs to the mixer come from channel group 0 (vehicle attitude), channels 0 (ro
See the README for more information on the scaler format.
Output 0
Output 1 - Empty
-----------------------------------------
Z:
Steering mixer using roll on output 1
Output 2 - Steering mixer using yaw
------------------------------------------
M: 1
O: 10000 10000 0 -10000 10000 5000
S: 0 2 10000 10000 0 -10000 10000
Output 2
Output 3 - Left row of wheels using yaw and throttle (1s rise time)
------------------------------------------
M: 2
O: 10000 10000 0 -10000 10000 10000
S: 0 2 -500 -500 0 0 10000
S: 0 3 10000 10000 0 -10000 10000
Output 3
Output 4 - Right row of wheels using yaw and throttle (1s rise time)
------------------------------------------
M: 2
O: 10000 10000 0 -10000 10000 10000
S: 0 2 500 500 0 0 10000
S: 0 3 10000 10000 0 -10000 10000
ROMFS/px4fmu_common/mixers/rover_generic.main.mix
+6 -4
View File
@@ -13,23 +13,25 @@ Inputs to the mixer come from channel group 0 (vehicle attitude), channels 2 (ya
See the README for more information on the scaler format.
Output 0
Output 1: Empty
---------------------------------------
Z:
Steering mixer using roll on output 1
Output 2: Steering mixer using yaw, with 0.5s rise time
---------------------------------------
M: 1
O: 10000 10000 0 -10000 10000 5000
S: 0 2 10000 10000 0 -10000 10000
Output 2
Output 3: Empty
---------------------------------------
This mixer is empty.
Z:
Output 3
Output 4: Throttle with 2s rise time
---------------------------------------
M: 1
O: 10000 10000 0 -10000 10000 20000
S: 0 3 10000 10000 0 -10000 10000
ROMFS/px4fmu_common/mixers/vectored6dof.main.mix
+16 -8
View File
@@ -1,32 +1,40 @@
# Motor 1
M: 2
M: 3
S: 0 2 -4000 -4000 0 -4000 +4000
S: 0 3 +4000 +4000 0 -4000 +4000
S: 0 4 +4000 +4000 0 -4000 +4000
# Motor 2
M: 2
M: 3
S: 0 2 +4000 +4000 0 -4000 +4000
S: 0 3 +4000 +4000 0 -4000 +4000
S: 0 4 -4000 -4000 0 -4000 +4000
# Motor 3
M: 2
M: 3
S: 0 2 -4000 -4000 0 -4000 +4000
S: 0 3 +4000 +4000 0 -4000 +4000
S: 0 4 -4000 -4000 0 -4000 +4000
# Motor 4
M: 2
M: 3
S: 0 2 +4000 +4000 0 -4000 +4000
S: 0 3 +4000 +4000 0 -4000 +4000
S: 0 4 +4000 +4000 0 -4000 +4000
# Motor 5
M: 2
M: 3
S: 0 0 -4000 -4000 0 -4000 +4000
S: 0 1 +4000 +4000 0 -4000 +4000
S: 0 5 +4000 +4000 0 -4000 +4000
# Motor 6
M: 2
M: 3
S: 0 0 -4000 -4000 0 -4000 +4000
S: 0 1 -4000 -4000 0 -4000 +4000
S: 0 5 -4000 -4000 0 -4000 +4000
# Motor 7
M: 2
M: 3
S: 0 0 +4000 +4000 0 -4000 +4000
S: 0 1 +4000 +4000 0 -4000 +4000
S: 0 5 -4000 -4000 0 -4000 +4000
# Motor 8
M: 2
M: 3
S: 0 0 +4000 +4000 0 -4000 +4000
S: 0 1 -4000 -4000 0 -4000 +4000
S: 0 5 +4000 +4000 0 -4000 +4000