mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-06-04 22:17:01 +08:00
[fixedwing] convert nav_survey_rectangle to a module
This commit is contained in:
committed by
Felix Ruess
parent
00b872ed00
commit
a47a9b46ca
@@ -194,6 +194,7 @@
|
|||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<load name="openlog.xml"/>
|
<load name="openlog.xml"/>
|
||||||
|
<load name="nav_survey_rectangle.xml"/>
|
||||||
<load name="infrared_adc.xml"/>
|
<load name="infrared_adc.xml"/>
|
||||||
<load name="digital_cam_servo.xml">
|
<load name="digital_cam_servo.xml">
|
||||||
<define name="DC_SHUTTER_SERVO" value="COMMAND_SHUTTER" />
|
<define name="DC_SHUTTER_SERVO" value="COMMAND_SHUTTER" />
|
||||||
|
|||||||
@@ -9,6 +9,6 @@ $(TARGET).CFLAGS += -DNAV
|
|||||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c
|
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c
|
||||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/common_flight_plan.c
|
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/common_flight_plan.c
|
||||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/traffic_info.c
|
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/traffic_info.c
|
||||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c $(SRC_SUBSYSTEMS)/navigation/nav_line.c
|
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_line.c
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ $(TARGET).CFLAGS += -DNAV
|
|||||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c
|
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c
|
||||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/common_flight_plan.c
|
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/common_flight_plan.c
|
||||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/traffic_info.c
|
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/traffic_info.c
|
||||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c $(SRC_SUBSYSTEMS)/navigation/nav_line.c
|
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_line.c
|
||||||
|
|
||||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/OSAMNav.c
|
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/OSAMNav.c
|
||||||
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/snav.c
|
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/snav.c
|
||||||
|
|||||||
@@ -0,0 +1,16 @@
|
|||||||
|
<!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>
|
||||||
+2
-2
@@ -20,14 +20,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file subsystems/navigation/nav_survey_rectangle.c
|
* @file modules/nav/nav_survey_rectangle.c
|
||||||
*
|
*
|
||||||
* Automatic survey of a rectangle for fixedwings.
|
* Automatic survey of a rectangle for fixedwings.
|
||||||
*
|
*
|
||||||
* Rectangle is defined by two points, sweep can be south-north or west-east.
|
* Rectangle is defined by two points, sweep can be south-north or west-east.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "subsystems/navigation/nav_survey_rectangle.h"
|
#include "modules/nav/nav_survey_rectangle.h"
|
||||||
#include "state.h"
|
#include "state.h"
|
||||||
|
|
||||||
static struct point survey_from;
|
static struct point survey_from;
|
||||||
+1
-1
@@ -20,7 +20,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file subsystems/navigation/nav_survey_rectangle.c
|
* @file modules/nav/nav_survey_rectangle.c
|
||||||
*
|
*
|
||||||
* Automatic survey of a rectangle for fixedwings.
|
* Automatic survey of a rectangle for fixedwings.
|
||||||
*
|
*
|
||||||
@@ -37,7 +37,6 @@
|
|||||||
#ifdef CTRL_TYPE_H
|
#ifdef CTRL_TYPE_H
|
||||||
#include CTRL_TYPE_H
|
#include CTRL_TYPE_H
|
||||||
#endif
|
#endif
|
||||||
#include "subsystems/navigation/nav_survey_rectangle.h"
|
|
||||||
#include "subsystems/navigation/common_flight_plan.h"
|
#include "subsystems/navigation/common_flight_plan.h"
|
||||||
#include "subsystems/navigation/common_nav.h"
|
#include "subsystems/navigation/common_nav.h"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user