fix common_nav includes

This commit is contained in:
Felix Ruess
2010-11-20 13:45:33 +01:00
parent b34c3672f4
commit 8ddd3e8c72
11 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -118,7 +118,7 @@ ap.srcs += $(TL)/tl_baro.c
ap.srcs += micromag.c $(SRC_ARCH)/micromag_hw.c
ap.CFLAGS += -DNAV
ap.srcs += common_nav.c $(TL)/tl_nav.c
ap.srcs += subsystems/navigation/common_nav.c $(TL)/tl_nav.c
#ap.CFLAGS += -D TL_BARO_W1=0xABDC -D TL_BARO_W2=0x849A -D TL_BARO_W3=0X939E -D TL_BARO_W4=0xB259
+1 -1
View File
@@ -11,7 +11,7 @@
#include "gps.h"
#include "estimator.h"
#include "latlong.h"
#include "common_nav.h"
#include "subsystems/navigation/common_nav.h"
uint8_t gps_mode;
uint16_t gps_week; /* weeks */
+1 -1
View File
@@ -11,7 +11,7 @@
#include "gps.h"
#include "estimator.h"
#include "latlong.h"
#include "common_nav.h"
#include "subsystems/navigation/common_nav.h"
#include <caml/mlvalues.h>
+1 -1
View File
@@ -52,7 +52,7 @@
#endif
#include "common_nav.h"
#include "subsystems/navigation/common_nav.h"
#include "settings.h"
#include "latlong.h"
+1 -1
View File
@@ -36,7 +36,7 @@
#include "modules.h"
#include <stdio.h>
#include "common_nav.h"
#include "subsystems/navigation/common_nav.h"
#include "settings.h"
#include "latlong.h"
+1 -1
View File
@@ -28,7 +28,7 @@
#include <math.h>
#include "cam.h"
#include "common_nav.h"
#include "subsystems/navigation/common_nav.h"
#include "autopilot.h"
#include "flight_plan.h"
#include "estimator.h"
+1 -1
View File
@@ -72,7 +72,7 @@ Receiving:
#include "gps.h"
#include "autopilot.h"
#include "estimator.h"
#include "common_nav.h"
#include "subsystems/navigation/common_nav.h"
#include "settings.h"
#ifndef GSM_LINK
+1 -1
View File
@@ -1,5 +1,5 @@
#include "nav_poles.h"
#include "common_nav.h"
#include "subsystems/navigation/common_nav.h"
uint8_t nav_poles_count = 0;
+1 -1
View File
@@ -362,7 +362,7 @@ void nav_route_xy(float last_wp_x, float last_wp_y, float wp_x, float wp_y) {
fly_to_xy(last_wp_x + nav_leg_progress*leg_x +nav_shift*leg_y/nav_leg_length, last_wp_y + nav_leg_progress*leg_y-nav_shift*leg_x/nav_leg_length);
}
#include "common_nav.c"
#include "subsystems/navigation/common_nav.c"
#ifndef FAILSAFE_HOME_RADIUS
#define FAILSAFE_HOME_RADIUS DEFAULT_CIRCLE_RADIUS
+1 -1
View File
@@ -36,7 +36,7 @@
#include "paparazzi.h"
#include "firmwares/fixedwing/guidance/guidance_v.h"
#include "nav_survey_rectangle.h"
#include "common_nav.h"
#include "subsystems/navigation/common_nav.h"
#define G 9.806
#define Square(_x) ((_x)*(_x))
@@ -22,7 +22,7 @@
*
*/
#include "common_nav.h"
#include "subsystems/navigation/common_nav.h"
#include "estimator.h"
#include "flight_plan.h"
#include "gps.h"