[paparazzi-commits] [5497] added a version flag for default parameters - need to make sure about the defaults of the v1 .0 parameters

[antoine drouin]

Revision: 5497
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5497
Author:   poine
Date:     2010-08-20 09:02:26 +0000 (Fri, 20 Aug 2010)
Log Message:
-----------
added a version flag for default parameters - need to make sure about the 
defaults of the v1.0 parameters

Modified Paths:
--------------
    paparazzi3/trunk/conf/autopilot/subsystems/booz2_imu_b2v1.makefile
    paparazzi3/trunk/conf/autopilot/subsystems/booz2_imu_b2v1_1.makefile

Modified: paparazzi3/trunk/conf/autopilot/subsystems/booz2_imu_b2v1.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/booz2_imu_b2v1.makefile  
2010-08-20 09:00:49 UTC (rev 5496)
+++ paparazzi3/trunk/conf/autopilot/subsystems/booz2_imu_b2v1.makefile  
2010-08-20 09:02:26 UTC (rev 5497)
@@ -5,10 +5,6 @@
 # required xml:
 #  <section name="IMU" prefix="IMU_">
 #
-#    <define name="GYRO_X_CHAN" value="1"/>
-#    <define name="GYRO_Y_CHAN" value="0"/>
-#    <define name="GYRO_Z_CHAN" value="2"/>
-#
 #    <define name="GYRO_X_NEUTRAL" value="33924"/>
 #    <define name="GYRO_Y_NEUTRAL" value="33417"/>
 #    <define name="GYRO_Z_NEUTRAL" value="32809"/>
@@ -17,10 +13,6 @@
 #    <define name="GYRO_Y_SENS" value="-1.01" integer="16"/>
 #    <define name="GYRO_Z_SENS" value="-1.01" integer="16"/>
 # 
-#    <define name="ACCEL_X_CHAN" value="3"/>
-#    <define name="ACCEL_Y_CHAN" value="5"/>
-#    <define name="ACCEL_Z_CHAN" value="6"/>    
-#
 #    <define name="ACCEL_X_NEUTRAL" value="32081"/>
 #    <define name="ACCEL_Y_NEUTRAL" value="33738"/>
 #    <define name="ACCEL_Z_NEUTRAL" value="32441"/>
@@ -29,10 +21,6 @@
 #    <define name="ACCEL_Y_SENS" value="-2.48126183" integer="16"/>
 #    <define name="ACCEL_Z_SENS" value="-2.51396167" integer="16"/>
 #
-#    <define name="MAG_X_CHAN" value="4"/>
-#    <define name="MAG_Y_CHAN" value="0"/>
-#    <define name="MAG_Z_CHAN" value="2"/>
-#
 #    <define name="MAG_X_NEUTRAL" value="2358"/>
 #    <define name="MAG_Y_NEUTRAL" value="2362"/> 
 #    <define name="MAG_Z_NEUTRAL" value="2119"/>
@@ -48,6 +36,7 @@
 
 # imu Booz2 v1
 ap.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
+ap.CFLAGS += -DIMU_B2_VERSION_1_0
 ap.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_AMI601
 ap.CFLAGS += -DSSP_VIC_SLOT=9
 ap.srcs += $(SRC_BOOZ)/booz_imu.c                   \

Modified: paparazzi3/trunk/conf/autopilot/subsystems/booz2_imu_b2v1_1.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/booz2_imu_b2v1_1.makefile        
2010-08-20 09:00:49 UTC (rev 5496)
+++ paparazzi3/trunk/conf/autopilot/subsystems/booz2_imu_b2v1_1.makefile        
2010-08-20 09:02:26 UTC (rev 5497)
@@ -1,14 +1,10 @@
 #
-# Booz2 IMU booz2v1
+# Booz2 IMU booz2v1.1
 #
 #
 # required xml:
 #  <section name="IMU" prefix="IMU_">
 #
-#    <define name="GYRO_X_CHAN" value="1"/>
-#    <define name="GYRO_Y_CHAN" value="0"/>
-#    <define name="GYRO_Z_CHAN" value="2"/>
-#
 #    <define name="GYRO_X_NEUTRAL" value="33924"/>
 #    <define name="GYRO_Y_NEUTRAL" value="33417"/>
 #    <define name="GYRO_Z_NEUTRAL" value="32809"/>
@@ -17,10 +13,6 @@
 #    <define name="GYRO_Y_SENS" value="-1.01" integer="16"/>
 #    <define name="GYRO_Z_SENS" value="-1.01" integer="16"/>
 # 
-#    <define name="ACCEL_X_CHAN" value="3"/>
-#    <define name="ACCEL_Y_CHAN" value="5"/>
-#    <define name="ACCEL_Z_CHAN" value="6"/>    
-#
 #    <define name="ACCEL_X_NEUTRAL" value="32081"/>
 #    <define name="ACCEL_Y_NEUTRAL" value="33738"/>
 #    <define name="ACCEL_Z_NEUTRAL" value="32441"/>
@@ -29,10 +21,6 @@
 #    <define name="ACCEL_Y_SENS" value="-2.48126183" integer="16"/>
 #    <define name="ACCEL_Z_SENS" value="-2.51396167" integer="16"/>
 #
-#    <define name="MAG_X_CHAN" value="4"/>
-#    <define name="MAG_Y_CHAN" value="0"/>
-#    <define name="MAG_Z_CHAN" value="2"/>
-#
 #    <define name="MAG_X_NEUTRAL" value="2358"/>
 #    <define name="MAG_Y_NEUTRAL" value="2362"/> 
 #    <define name="MAG_Z_NEUTRAL" value="2119"/>
@@ -49,6 +37,7 @@
 # imu Booz2 v1.1
 ap.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
 ap.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_MS2001
+ap.CFLAGS += -DIMU_B2_VERSION_1_1
 ap.srcs += $(SRC_BOOZ)/booz_imu.c                   \
            $(SRC_BOOZ)/imu/booz_imu_b2.c            \
            $(SRC_BOOZ_ARCH)/imu/booz_imu_b2_arch.c