[paparazzi-commits] [5181] remove necessary flag IMU_OVERRIDE_CHANNELS and check if channels are defined in airframe file already

[Felix Ruess]

Revision: 5181
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5181
Author:   flixr
Date:     2010-07-28 01:07:45 +0000 (Wed, 28 Jul 2010)
Log Message:
-----------
remove necessary flag IMU_OVERRIDE_CHANNELS and check if channels are defined 
in airframe file already

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/booz/imu/booz_imu_b2.h

Modified: paparazzi3/trunk/sw/airborne/booz/imu/booz_imu_b2.h
===================================================================
--- paparazzi3/trunk/sw/airborne/booz/imu/booz_imu_b2.h 2010-07-27 22:01:40 UTC 
(rev 5180)
+++ paparazzi3/trunk/sw/airborne/booz/imu/booz_imu_b2.h 2010-07-28 01:07:45 UTC 
(rev 5181)
@@ -35,18 +35,23 @@
 #define IMU_B2_MAG_AMI601 2
 
 /* Default IMU b2 sensors connection */
-#ifndef IMU_OVERRIDE_CHANNELS
+#if !defined IMU_GYRO_P_CHAN & !defined IMU_GYRO_Q_CHAN & !defined 
IMU_GYRO_R_CHAN
 #define IMU_GYRO_P_CHAN  1
 #define IMU_GYRO_Q_CHAN  0
 #define IMU_GYRO_R_CHAN  2
+#endif
+#if !defined IMU_ACCEL_X_CHAN & !defined IMU_ACCEL_Y_CHAN & !defined 
IMU_ACCEL_Z_CHAN
 #define IMU_ACCEL_X_CHAN 5
 #define IMU_ACCEL_Y_CHAN 3
 #define IMU_ACCEL_Z_CHAN 4
+#endif
+#if !defined IMU_MAG_X_CHAN & !defined IMU_MAG_Y_CHAN & !defined IMU_MAG_Z_CHAN
 #define IMU_MAG_X_CHAN   0
 #define IMU_MAG_Y_CHAN   1
 #define IMU_MAG_Z_CHAN   2
-#endif /* not IMU_OVERRIDE_CHANNELS */
+#endif
 
+
 #if !defined IMU_GYRO_P_SIGN & !defined IMU_GYRO_Q_SIGN & !defined 
IMU_GYRO_R_SIGN
 #define IMU_GYRO_P_SIGN   1
 #define IMU_GYRO_Q_SIGN  -1