[fix] remove ins_neutrals settings file (#2843)

this is not a proper fix, but a workaroud to compile example files and
prevent to use the old ins_neutrals.xml file that is no longer valid.
the issue of ins neutrals should be treated correctly later, either by
adding proper settings to each modules that requires it, or using a
ins_common module
This commit is contained in:
Gautier Hattenberger
2022-03-20 16:03:34 +01:00
committed by GitHub
parent 0b62eb89ef
commit 502427f823
5 changed files with 11 additions and 13 deletions
+1 -1
View File
@@ -17,7 +17,7 @@
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/versatile.xml"
settings="settings/fixedwing_basic.xml settings/estimation/ins_neutrals.xml settings/control/ctl_dash_loiter_trim.xml"
settings="settings/fixedwing_basic.xml settings/control/ctl_dash_loiter_trim.xml"
settings_modules="modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/gps.xml"
gui_color="blue"
/>
+1 -1
View File
@@ -105,7 +105,7 @@
radio="radios/cockpitSX.xml"
telemetry="telemetry/default_fixedwing_imu.xml"
flight_plan="flight_plans/versatile.xml"
settings="settings/fixedwing_basic.xml settings/estimation/ins_neutrals.xml settings/control/ctl_dash_loiter_trim.xml"
settings="settings/fixedwing_basic.xml settings/control/ctl_dash_loiter_trim.xml"
settings_modules="modules/nav_basic_fw.xml modules/guidance_basic_fw.xml modules/stabilization_attitude_fw.xml modules/gps.xml"
gui_color="blue"
/>
+8
View File
@@ -8,6 +8,14 @@
<configure name="XSENS_PORT" value="uart1" description="The (uart) port the XSens is connected to"/>
<configure name="XSENS_BAUD" value="B115200" description="UART baud rate"/>
</doc>
<settings>
<dl_settings>
<dl_settings NAME="xsens700">
<dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="ins_roll_neutral" shortname="roll_neutral" module="modules/ahrs/ahrs" param="INS_ROLL_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg" type="float" persistent="true"/>
<dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="ins_pitch_neutral" shortname="pitch_neutral" param="INS_PITCH_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg" type="float" persistent="true"/>
</dl_settings>
</dl_settings>
</settings>
<dep>
<depends>uart,gps</depends>
<provides>ins,ahrs,gps</provides>
-10
View File
@@ -1,10 +0,0 @@
<!DOCTYPE settings SYSTEM "../settings.dtd">
<settings>
<dl_settings>
<dl_settings NAME="ins">
<dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="ins_roll_neutral" shortname="roll_neutral" module="modules/ahrs/ahrs" param="INS_ROLL_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg" type="float" persistent="true"/>
<dl_setting MAX="15" MIN="-15" STEP="0.5" VAR="ins_pitch_neutral" shortname="pitch_neutral" param="INS_PITCH_NEUTRAL_DEFAULT" unit="rad" alt_unit="deg" type="float" persistent="true"/>
</dl_settings>
</dl_settings>
</settings>
+1 -1
View File
@@ -387,7 +387,7 @@
radio="radios/CDW/cdw_t8fg_sbus.xml"
telemetry="telemetry/default_fixedwing.xml"
flight_plan="flight_plans/versatile.xml"
settings="settings/fixedwing_basic.xml settings/estimation/ins_neutrals.xml"
settings="settings/fixedwing_basic.xml"
settings_modules="modules/gps.xml modules/guidance_basic_fw.xml modules/light.xml modules/nav_basic_fw.xml modules/stabilization_attitude_fw.xml"
gui_color="blue"
release="679fcad03bab95b2982cb6d8e3537486da45d306"