Skip to content

Commit

Permalink
[ins] convert ins subsystems to modules
Browse files Browse the repository at this point in the history
and get rid of ins calls in main and register functions
  • Loading branch information
flixr committed Jun 17, 2016
1 parent f1b4dd9 commit babb86a
Show file tree
Hide file tree
Showing 45 changed files with 323 additions and 553 deletions.
9 changes: 0 additions & 9 deletions conf/firmwares/subsystems/fixedwing/ins_alt_float.makefile

This file was deleted.

40 changes: 0 additions & 40 deletions conf/firmwares/subsystems/fixedwing/ins_float_invariant.makefile

This file was deleted.

16 changes: 0 additions & 16 deletions conf/firmwares/subsystems/fixedwing/ins_gps_passthrough.makefile

This file was deleted.

43 changes: 0 additions & 43 deletions conf/firmwares/subsystems/fixedwing/ins_vectornav.makefile

This file was deleted.

1 change: 0 additions & 1 deletion conf/firmwares/subsystems/fixedwing/ins_xsens.makefile

This file was deleted.

11 changes: 0 additions & 11 deletions conf/firmwares/subsystems/rotorcraft/ins.makefile

This file was deleted.

11 changes: 0 additions & 11 deletions conf/firmwares/subsystems/rotorcraft/ins_extended.makefile

This file was deleted.

12 changes: 0 additions & 12 deletions conf/firmwares/subsystems/rotorcraft/ins_gps_passthrough.makefile

This file was deleted.

14 changes: 0 additions & 14 deletions conf/firmwares/subsystems/rotorcraft/ins_hff.makefile

This file was deleted.

25 changes: 0 additions & 25 deletions conf/firmwares/subsystems/rotorcraft/ins_vectornav.makefile

This file was deleted.

30 changes: 0 additions & 30 deletions conf/firmwares/subsystems/shared/ins_float_invariant.makefile

This file was deleted.

55 changes: 0 additions & 55 deletions conf/firmwares/subsystems/shared/ins_vectornav.makefile

This file was deleted.

1 change: 0 additions & 1 deletion conf/firmwares/subsystems/shared/ins_xsens700.makefile

This file was deleted.

19 changes: 19 additions & 0 deletions conf/modules/ins.xml
@@ -0,0 +1,19 @@
<!DOCTYPE module SYSTEM "module.dtd">

<module name="ins">
<doc>
<description>
simple INS with vertical filter.
</description>
</doc>
<header>
<file name="ins_int.h" dir="subsystems/ins"/>
</header>
<init fun="ins_int_init()"/>
<makefile target="ap|nps">
<define name="INS_TYPE_H" value="subsystems/ins/ins_int.h" type="string"/>
<file name="ins.c" dir="subsystems"/>
<file name="ins_int.c" dir="subsystems/ins"/>
<file name="vf_float.c" dir="subsystems/ins"/>
</makefile>
</module>
19 changes: 19 additions & 0 deletions conf/modules/ins_alt_float.xml
@@ -0,0 +1,19 @@
<!DOCTYPE module SYSTEM "module.dtd">

<module name="ins_alt_float">
<doc>
<description>
INS with Kalman Filter on altitude.
For fixedwings.
</description>
</doc>
<header>
<file name="ins_alt_float.h" dir="subsystems/ins"/>
</header>
<init fun="ins_alt_float_init()"/>
<makefile target="ap|nps|sim" firmware="fixedwing">
<define name="INS_TYPE_H" value="subsystems/ins/ins_alt_float.h" type="string"/>
<file name="ins.c" dir="subsystems"/>
<file name="ins_alt_float.c" dir="subsystems/ins"/>
</makefile>
</module>
20 changes: 20 additions & 0 deletions conf/modules/ins_extended.xml
@@ -0,0 +1,20 @@
<!DOCTYPE module SYSTEM "module.dtd">

<module name="ins">
<doc>
<description>
extended INS with vertical filter using sonar.
</description>
</doc>
<header>
<file name="ins_int.h" dir="subsystems/ins"/>
</header>
<init fun="ins_int_init()"/>
<makefile target="ap|nps">
<define name="INS_TYPE_H" value="subsystems/ins/ins_int.h" type="string"/>
<file name="ins.c" dir="subsystems"/>
<file name="ins_int.c" dir="subsystems/ins"/>
<file name="vf_extended_float.c" dir="subsystems/ins"/>
<define name="USE_VFF_EXTENDED"/>
</makefile>
</module>
39 changes: 39 additions & 0 deletions conf/modules/ins_float_invariant.xml
@@ -0,0 +1,39 @@
<!DOCTYPE module SYSTEM "module.dtd">

<module name="ins_float_invariant">
<doc>
<description>
Invariant INS (in float).
Estimates attitude, velocity, position and (gyro, accel, baro) biases.
</description>
<configure name="USE_MAGNETOMETER" value="TRUE|FALSE" description="use magnetometer"/>
<configure name="AHRS_ALIGNER_LED" value="2" description="LED number to indicate if AHRS/INS is aligned"/>
</doc>
<header>
<file name="ins_float_invariant_wrapper.h" dir="subsystems/ins"/>
</header>
<init fun="ins_float_invariant_wrapper_init()"/>
<makefile target="ap|nps">
<configure name="AHRS_ALIGNER_LED" default="none"/>
<define name="AHRS_ALIGNER_LED" value="$(AHRS_ALIGNER_LED)" cond="ifneq ($(AHRS_ALIGNER_LED),none)"/>
<configure name="USE_MAGNETOMETER" default="TRUE"/>
<define name="USE_MAGNETOMETER" cond="ifeq (,$(findstring $(USE_MAGNETOMETER),0 FALSE))"/>

<file name="ahrs_aligner.c" dir="subsystems/ahrs"/>
<file name="ins.c" dir="subsystems"/>
<file name="ins_float_invariant.c" dir="subsystems/ins"/>
<file name="ins_float_invariant_wrapper.c" dir="subsystems/ins"/>

<define name="USE_AHRS_ALIGNER"/>
<define name="INS_TYPE_H" value="subsystems/ins/ins_float_invariant_wrapper.h" type="string"/>
</makefile>
<makefile target="ap|nps" firmware="fixedwing">
<define name="INS_FINV_USE_UTM"/>
</makefile>
<makefile target="sim">
<define name="AHRS_TYPE_H" value="subsystems/ahrs/ahrs_sim.h" type="string"/>
<define name="USE_AHRS"/>
<file name="ahrs.c" dir="subsystems"/>
<file name="ahrs_sim.c" dir="subsystems/ahrs"/>
</makefile>
</module>

0 comments on commit babb86a

Please sign in to comment.