[paparazzi-commits] [6009] fix guidance includes

[Felix Ruess]

Revision: 6009
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6009
Author:   flixr
Date:     2010-09-28 14:05:34 +0000 (Tue, 28 Sep 2010)
Log Message:
-----------
fix guidance includes

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h
    paparazzi3/trunk/sw/airborne/booz/booz_fms.h
    paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/autopilot.c
    paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/main.c
    paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi.c
    paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi.h
    paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi_overo_link.c
    paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi_overo_link.h

Modified: paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h 2010-09-28 14:05:27 UTC 
(rev 6008)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_telemetry.h 2010-09-28 14:05:34 UTC 
(rev 6009)
@@ -35,7 +35,7 @@
 #endif
 
 #include "autopilot.h"
-#include "guidance.h"
+#include <firmwares/rotorcraft/guidance.h>
 
 #include "actuators.h"
 

Modified: paparazzi3/trunk/sw/airborne/booz/booz_fms.h
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz_fms.h        2010-09-28 14:05:27 UTC 
(rev 6008)
+++ paparazzi3/trunk/sw/airborne/booz/booz_fms.h        2010-09-28 14:05:34 UTC 
(rev 6009)
@@ -4,7 +4,7 @@
  * This is the "external interface" to the autopilot. It allows an external 
device to
  * fetch the vehicle state and input commands at different levels. We should 
support
  * different hardware peripherals like i2c, spi or uart.
- * For now we only have an implementation using datalink messages. 
+ * For now we only have an implementation using datalink messages.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 #include "std.h"
 #include "math/pprz_algebra_int.h"
 #include "autopilot.h"
-#include "guidance.h"
+#include <firmwares/rotorcraft/guidance.h>
 
 struct Booz_fms_imu_info {
   struct Int16Vect3 gyro;
@@ -127,5 +127,3 @@
   }
 
 #endif /* BOOZ_FMS_H */
-
-

Modified: paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/autopilot.c
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/autopilot.c       
2010-09-28 14:05:27 UTC (rev 6008)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/autopilot.c       
2010-09-28 14:05:34 UTC (rev 6009)
@@ -27,7 +27,7 @@
 #include "booz_radio_control.h"
 #include "booz2_commands.h"
 #include "booz2_navigation.h"
-#include "guidance.h"
+#include <firmwares/rotorcraft/guidance.h>
 #include "booz_stabilization.h"
 #include "led.h"
 

Modified: paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/main.c
===================================================================
--- paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/main.c    2010-09-28 
14:05:27 UTC (rev 6008)
+++ paparazzi3/trunk/sw/airborne/firmwares/rotorcraft/main.c    2010-09-28 
14:05:34 UTC (rev 6009)
@@ -50,7 +50,7 @@
 #include "autopilot.h"
 
 #include "booz_stabilization.h"
-#include "guidance.h"
+#include <firmwares/rotorcraft/guidance.h>
 
 #include "ahrs.h"
 #include "ins.h"

Modified: paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi.c
===================================================================
--- paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi.c 2010-09-28 
14:05:27 UTC (rev 6008)
+++ paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi.c 2010-09-28 
14:05:34 UTC (rev 6009)
@@ -1,6 +1,6 @@
 /*
  * $Id:  $
- *  
+ *
  * Copyright (C) 2008-2010 The Paparazzi Team
  *
  * This file is part of paparazzi.
@@ -18,14 +18,14 @@
  * You should have received a copy of the GNU General Public License
  * along with paparazzi; see the file COPYING.  If not, write to
  * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA. 
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "vehicle_interface/vi.h"
 
-#include "firmwares/rotorcraft/imu.h"
+#include <firmwares/rotorcraft/imu.h>
 #include "booz/booz_gps.h"
-#include "firmwares/rotorcraft/ahrs.h"
+#include <firmwares/rotorcraft/ahrs.h>
 
 #include "airframe.h"
 
@@ -51,7 +51,7 @@
 
 void vi_periodic(void) {
 #if (VI_TIMEOUT != 0)
-  if (vi.last_msg < VI_TIMEOUT) 
+  if (vi.last_msg < VI_TIMEOUT)
     vi.last_msg++;
   else {
     vi.timeouted = TRUE;

Modified: paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi.h
===================================================================
--- paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi.h 2010-09-28 
14:05:27 UTC (rev 6008)
+++ paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi.h 2010-09-28 
14:05:34 UTC (rev 6009)
@@ -8,7 +8,7 @@
  * This is the "external interface" to the autopilot. It allows an external 
device to
  * fetch the vehicle state and input commands at different levels. We should 
support
  * different hardware peripherals like i2c, spi or uart.
- * For now we only have an implementation using datalink messages. 
+ * For now we only have an implementation using datalink messages.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 #include "math/pprz_algebra_int.h"
 #include "autopilot.h"
 #include "booz/booz_stabilization.h"
-#include "booz/guidance.h"
+#include <firmwares/rotorcraft/guidance.h>
 #include "booz/booz2_navigation.h"
 
 struct Vi_imu_info {
@@ -103,5 +103,3 @@
   }
 
 #endif /* VI_H */
-
-

Modified: paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi_overo_link.c
===================================================================
--- paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi_overo_link.c      
2010-09-28 14:05:27 UTC (rev 6008)
+++ paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi_overo_link.c      
2010-09-28 14:05:34 UTC (rev 6009)
@@ -1,6 +1,6 @@
 /*
  * $Id$
- *  
+ *
  * Copyright (C) 2010 The Paparazzi Team
  *
  * This file is part of paparazzi.
@@ -18,13 +18,13 @@
  * You should have received a copy of the GNU General Public License
  * along with paparazzi; see the file COPYING.  If not, write to
  * the Free Software Foundation, 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA. 
+ * Boston, MA 02111-1307, USA.
  */
 
 #include "modules/vehicle_interface/vi_overo_link.h"
 
 #include "lisa/lisa_overo_link.h"
-#include "firmwares/rotorcraft/imu.h"
+#include <firmwares/rotorcraft/imu.h>
 
 
 #include <string.h>
@@ -48,10 +48,10 @@
 }
 
 void vi_overo_link_on_msg_received(void) {
-  
+
 #if 0
-  memcpy(&overo_link.up.msg, &overo_link.down.msg, 
-        sizeof(union AutopilotMessage));
+  memcpy(&overo_link.up.msg, &overo_link.down.msg,
+     sizeof(union AutopilotMessage));
 #endif
   overo_link.up.msg.valid.imu = 1;
   RATES_COPY(overo_link.up.msg.gyro, imu.gyro);
@@ -62,6 +62,6 @@
 
 
 void vi_overo_link_on_crc_err(void) {
-  
- 
+
+
 }

Modified: paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi_overo_link.h
===================================================================
--- paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi_overo_link.h      
2010-09-28 14:05:27 UTC (rev 6008)
+++ paparazzi3/trunk/sw/airborne/modules/vehicle_interface/vi_overo_link.h      
2010-09-28 14:05:34 UTC (rev 6009)
@@ -4,7 +4,7 @@
  * Copyright (C) 2010 The Paparazzi Team
  *
  * This is the implementation of the "external interface" to the autopilot.
- * using overo_spi_link. 
+ * using overo_spi_link.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by