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

16/02/2021 Upstream Merge
This commit is contained in:
JaeyoungLim
2021-02-23 09:43:53 +01:00
committed by GitHub
115 changed files with 2438 additions and 3104 deletions
@@ -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
@@ -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
@@ -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
+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
-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