From 38439256e5875eddf745a4c72be4350e1df3c088 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Tue, 14 Dec 2021 10:54:43 +0100 Subject: [PATCH] Mantis: move MIXER vars to airframe init The two were actually conflicting and are now consolidated. --- ROMFS/px4fmu_common/init.d/airframes/4061_atl_mantis_edu | 6 ++++-- boards/atl/mantis-edu/init/rc.board_defaults | 5 ----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ROMFS/px4fmu_common/init.d/airframes/4061_atl_mantis_edu b/ROMFS/px4fmu_common/init.d/airframes/4061_atl_mantis_edu index 3bdbeac3b4..98d3c95509 100644 --- a/ROMFS/px4fmu_common/init.d/airframes/4061_atl_mantis_edu +++ b/ROMFS/px4fmu_common/init.d/airframes/4061_atl_mantis_edu @@ -16,8 +16,10 @@ . ${R}etc/init.d/rc.mc_defaults -set MIXER none -set MIXER_AUX none +# We set the mixer and ESC manually. +set MIXER skip +set MIXER_AUX skip +set MIXER_FILE "" # Battery settings param set-default BAT_CRIT_THR 0.20 diff --git a/boards/atl/mantis-edu/init/rc.board_defaults b/boards/atl/mantis-edu/init/rc.board_defaults index b1b3bf097a..8de16d64e4 100644 --- a/boards/atl/mantis-edu/init/rc.board_defaults +++ b/boards/atl/mantis-edu/init/rc.board_defaults @@ -26,8 +26,3 @@ set LOGGER_ARGS "-m mavlink -c 0.5" # Save missions RAM set DATAMAN_ARGS "-r" -# We set the mixer and ESC manually. -set MIXER_FILE "" -set MIXER "skip" -set OUTPUT_MODE "skip" -