paparazzi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [4599] indentation


From: antoine drouin
Subject: [paparazzi-commits] [4599] indentation
Date: Fri, 26 Feb 2010 08:08:44 +0000

Revision: 4599
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4599
Author:   poine
Date:     2010-02-26 08:08:44 +0000 (Fri, 26 Feb 2010)
Log Message:
-----------
indentation

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/booz/booz2_main.c

Modified: paparazzi3/trunk/sw/airborne/booz/booz2_main.c
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/booz2_main.c      2010-02-25 20:44:50 UTC 
(rev 4598)
+++ paparazzi3/trunk/sw/airborne/booz/booz2_main.c      2010-02-26 08:08:44 UTC 
(rev 4599)
@@ -85,8 +85,6 @@
 static inline void on_gps_event( void );
 static inline void on_mag_event( void );
 
-uint32_t t0, t1, diff;
-
 #ifndef SITL
 int main( void ) {
   booz2_main_init();
@@ -164,17 +162,15 @@
 
 
 STATIC_INLINE void booz2_main_periodic( void ) {
-  //  t0 = T0TC;
-
   booz_imu_periodic();
-//#ifdef BOOZ_START_DELAY
+  
 #if defined BOOZ_START_DELAY && ! defined SITL
   if (!delay_done) {
     if ((uint32_t)(T0TC-init_done_time) < 
SYS_TICS_OF_USEC((uint32_t)(BOOZ_START_DELAY*1e6))) return;
     else delay_done = TRUE;
   }
 #endif
-
+  
   /* run control loops */
   booz2_autopilot_periodic();
   /* set actuators     */
@@ -183,9 +179,11 @@
   PeriodicPrescaleBy10(                                                        
\
     {                                                                  \
       radio_control_periodic();                                                
\
-                        if (radio_control.status != RADIO_CONTROL_OK && 
booz2_autopilot_mode != BOOZ2_AP_MODE_KILL && booz2_autopilot_mode != 
BOOZ2_AP_MODE_NAV) \
-                          booz2_autopilot_set_mode(BOOZ2_AP_MODE_FAILSAFE); \
-                      },                                               \
+      if (radio_control.status != RADIO_CONTROL_OK &&                  \
+          booz2_autopilot_mode != BOOZ2_AP_MODE_KILL &&                        
\
+          booz2_autopilot_mode != BOOZ2_AP_MODE_NAV)                   \
+        booz2_autopilot_set_mode(BOOZ2_AP_MODE_FAILSAFE);              \
+    },                                                                 \
     {                                                                  \
       Booz2TelemetryPeriodic();                                                
\
     },                                                                 \
@@ -204,8 +202,9 @@
     );                                                                 \
 
 #ifdef USE_GPS
-      if (radio_control.status != RADIO_CONTROL_OK && booz2_autopilot_mode == 
BOOZ2_AP_MODE_NAV && GpsIsLost())        \
-       booz2_autopilot_set_mode(BOOZ2_AP_MODE_FAILSAFE);               \
+  if (radio_control.status != RADIO_CONTROL_OK &&                      \
+      booz2_autopilot_mode == BOOZ2_AP_MODE_NAV && GpsIsLost())                
\
+    booz2_autopilot_set_mode(BOOZ2_AP_MODE_FAILSAFE);                  \
   booz_gps_periodic();
 #endif
 
@@ -229,11 +228,6 @@
     RunOnceEvery(512, { booz2_autopilot_flight_time++; datalink_time++; });
   }
 
-  //  t1 = T0TC;
-  //  diff = t1 - t0;
-  //  RunOnceEvery(100, {DOWNLINK_SEND_TIME(&diff);});
-  //  t0 = t1;
-
 }
 
 STATIC_INLINE void booz2_main_event( void ) {





reply via email to

[Prev in Thread] Current Thread [Next in Thread]