[paparazzi-commits] [6295] forgot to remove tcas code from main_ap ( execpt for CallTcas macro called by nav task)

[Gautier Hattenberger]

Revision: 6295
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6295
Author:   gautier
Date:     2010-10-28 09:24:52 +0000 (Thu, 28 Oct 2010)
Log Message:
-----------
forgot to remove tcas code from main_ap (execpt for CallTcas macro called by 
nav task)

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/main_ap.c

Modified: paparazzi3/trunk/sw/airborne/main_ap.c
===================================================================
--- paparazzi3/trunk/sw/airborne/main_ap.c      2010-10-28 08:15:17 UTC (rev 
6294)
+++ paparazzi3/trunk/sw/airborne/main_ap.c      2010-10-28 09:24:52 UTC (rev 
6295)
@@ -83,10 +83,6 @@
 #include "traffic_info.h"
 #endif
 
-#ifdef TCAS
-#include "tcas.h"
-#endif
-
 #ifdef USE_USB_SERIAL
 #include "usb_serial.h"
 #endif
@@ -418,18 +414,7 @@
     kill_throttle |= (t >= LOW_BATTERY_DELAY);
     kill_throttle |= launch && (dist2_to_home > Square(KILL_MODE_DISTANCE));
   }
-  switch (_1Hz) {
 
-#ifdef TCAS
-  case 6:
-    /** conflicts monitoring at 1Hz */
-    tcas_periodic_task_1Hz();
-    break;
-#endif
-  default:
-    break;
-  }
-
   switch(_4Hz) {
   case 0:
 #ifdef SITL
@@ -468,13 +453,6 @@
     break;
 #endif
 
-#ifdef TCAS
-  case 14:
-    /** tcas altitude control loop at 4Hz just before navigation task */
-    tcas_periodic_task_4Hz();
-    break;
-#endif
-
     /*  default: */
   }
 
@@ -623,10 +601,6 @@
   traffic_info_init();
 #endif
 
-#ifdef TCAS
-  tcas_init();
-#endif
-
 }