airframe metadata sort by SYS_AUTOSTART and minor cleanup (#8009)

This commit is contained in:
Daniel Agar
2017-09-25 11:17:50 -04:00
committed by GitHub
parent 420df9d88a
commit d04d62c37e
20 changed files with 173 additions and 90 deletions

View File

@@ -1,6 +1,6 @@
#!nsh
#
# @name Generic Hexa coaxial geometry
# @name Generic Hexarotor coaxial geometry
#
# @type Hexarotor Coaxial
# @class Copter

View File

@@ -0,0 +1,38 @@
#!nsh
#
# @name Generic Quadplane VTOL
#
# @type Standard VTOL
# @class VTOL
#
# @maintainer
#
# @output MAIN1 motor 1
# @output MAIN2 motor 2
# @output MAIN3 motor 3
# @output MAIN4 motor 4
# @output AUX1 Aileron 1
# @output AUX2 Aileron 2
# @output AUX3 Elevator
# @output AUX4 Rudder
# @output AUX5 Throttle
#
# @board px4fmu-v1 exclude
sh /etc/init.d/rc.vtol_defaults
if [ $AUTOCNF == yes ]
then
param set VT_TYPE 2
param set VT_MOT_COUNT 4
fi
set MIXER quad_x
set PWM_OUT 1234
set PWM_RATE 400
set MIXER_AUX vtol_AAERT
set PWM_ACHDIS 5
set PWM_AUX_DISARMED 950
set MAV_TYPE 22

View File

@@ -0,0 +1,18 @@
#!nsh
#
# @name Generic Flying Wing
#
# @type Flying Wing
# @class Plane
#
# @maintainer
#
sh /etc/init.d/rc.fw_defaults
if [ $AUTOCNF == yes ]
then
fi
set MIXER fw_generic_wing

View File

@@ -43,7 +43,8 @@ then
param set FW_RR_P 0.04
fi
set MIXER Q
set MIXER fw_generic_wing
# Provide ESC a constant 1000 us pulse while disarmed
set PWM_OUT 4
set PWM_DISARMED 1000

View File

@@ -40,4 +40,4 @@ then
param set FW_RR_P 0.04
fi
set MIXER X5
set MIXER fw_generic_wing

View File

@@ -1,6 +1,6 @@
#!nsh
#
# @name Generic Quadrotor X config
# @name Generic Quadrotor x
#
# @type Quadrotor x
# @class Copter

View File

@@ -1,6 +1,6 @@
#!nsh
#
# @name Generic Quadrotor X config with mount (e.g. gimbal)
# @name Generic Quadrotor x with mount (e.g. gimbal)
#
# @type Quadrotor x
# @class Copter

View File

@@ -0,0 +1,61 @@
#!nsh
#
# @name Generic Ground Vehicle
#
# @type Rover
# @class Rover
#
# @output MAIN2 steering
# @output MAIN4 throttle
#
# @maintainer
#
sh /etc/init.d/rc.ugv_defaults
if [ $AUTOCNF == yes ]
then
param set BAT_N_CELLS 2
param set FW_AIRSPD_MIN 0
param set FW_AIRSPD_TRIM 1
param set FW_AIRSPD_MAX 3
param set NAV_ACC_RAD 0.5
param set MIS_LTRMIN_ALT 0.01
param set MIS_TAKEOFF_ALT 0.01
param set EKF2_GBIAS_INIT 0.01
param set EKF2_ANGERR_INIT 0.01
param set EKF2_MAG_TYPE 1
param set GND_WR_P 2
param set GND_WR_I 0.9674
param set GND_WR_IMAX 0.1
param set GND_WR_D 1.2
param set GND_SP_CTRL_MODE 1
param set GND_L1_DIST 10
param set GND_THR_IDLE 0
param set GND_THR_CRUISE 0
param set GND_THR_MAX 0.5
param set GND_THR_MIN 0
param set GND_SPEED_P 0.25
param set GND_SPEED_I 0.001
param set GND_SPEED_D 3
param set GND_SPEED_IMAX 0.125
param set GND_SPEED_THR_SC 1
fi
# Configure this as ugv
set MAV_TYPE 10
# Set mixer
set MIXER ugv_generic
# Provide ESC a constant 1500 us pulse
set PWM_DISARMED 1500
set PWM_MAIN_REV2 1
set PWM_MAX 2000
set PWM_MIN 1000

View File

@@ -13,7 +13,7 @@
# @maintainer Marco Zorzi
#
sh /etc/init.d/rc.gnd_defaults
sh /etc/init.d/rc.ugv_defaults
if [ $AUTOCNF == yes ]
then
@@ -52,6 +52,7 @@ fi
# Configure this as ugv
set MAV_TYPE 10
# Set mixer
set MIXER stampede

View File

@@ -9,7 +9,7 @@ then
#
param set NAV_DLL_ACT 0
param set NAV_ACC_RAD 2.0
# temporary
param set NAV_FW_ALT_RAD 1000

View File

@@ -865,7 +865,7 @@ then
if [ $MIXER == none ]
then
# Set default mixer for UGV if not defined
set MIXER stampede
set MIXER ugv_generic
fi
if [ $MAV_TYPE == none ]
@@ -880,7 +880,7 @@ then
sh /etc/init.d/rc.interface
# Start standard UGV apps
sh /etc/init.d/rc.gnd_apps
sh /etc/init.d/rc.ugv_apps
fi
#