[fixedwing] nav_survey_rectangle back to subsystems

conf/airframes/examples/microjet.xml

@@ -194,7 +194,6 @@
 
   <modules>
     <load name="openlog.xml"/>
-    <load name="nav_survey_rectangle.xml"/>
     <load name="nav_survey_poly_adv.xml"/>
     <load name="nav_border_line.xml"/>
     <load name="infrared_adc.xml"/>

conf/firmwares/subsystems/fixedwing/navigation.makefile

@@ -9,6 +9,6 @@ $(TARGET).CFLAGS += -DNAV
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/common_flight_plan.c
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/traffic_info.c
-$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_line.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c $(SRC_SUBSYSTEMS)/navigation/nav_line.c
 
 

conf/firmwares/subsystems/fixedwing/navigation_extra.makefile

@@ -9,7 +9,7 @@ $(TARGET).CFLAGS += -DNAV
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/common_flight_plan.c
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/traffic_info.c
-$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_line.c
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c $(SRC_SUBSYSTEMS)/navigation/nav_line.c
 
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/OSAMNav.c
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/snav.c

conf/modules/nav_survey_rectangle.xml

@@ -1,16 +0,0 @@
-<!DOCTYPE module SYSTEM "module.dtd">
-
-<module name="nav_survey_rectangle" dir="nav">
-  <doc>
-    <description>
-      Automatic survey of a rectangle for fixedwings.
-      Rectangle is defined in flight plan by two points, sweep can be south-north or west-east.
-    </description>
-  </doc>
-  <header>
-    <file name="nav_survey_rectangle.h"/>
-  </header>
-  <makefile>
-    <file name="nav_survey_rectangle.c"/>
-  </makefile>
-</module>

sw/airborne/subsystems/nav.h

@@ -37,6 +37,7 @@
 #ifdef CTRL_TYPE_H
 #include CTRL_TYPE_H
 #endif
+#include "subsystems/navigation/nav_survey_rectangle.h"
 #include "subsystems/navigation/common_flight_plan.h"
 #include "subsystems/navigation/common_nav.h"
 

sw/airborne/subsystems/navigation/nav_survey_rectangle.c

@@ -20,14 +20,14 @@
  */
 
 /**
- * @file modules/nav/nav_survey_rectangle.c
+ * @file subsystems/navigation/nav_survey_rectangle.c
  *
  * Automatic survey of a rectangle for fixedwings.
  *
  * Rectangle is defined by two points, sweep can be south-north or west-east.
  */
 
-#include "modules/nav/nav_survey_rectangle.h"
+#include "subsystems/navigation/nav_survey_rectangle.h"
 #include "state.h"
 
 static struct point survey_from;

sw/airborne/subsystems/navigation/nav_survey_rectangle.h

@@ -20,7 +20,7 @@
  */
 
 /**
- * @file modules/nav/nav_survey_rectangle.c
+ * @file subsystems/navigation/nav_survey_rectangle.c
  *
  * Automatic survey of a rectangle for fixedwings.
  *