[paparazzi-commits] [5584] "making names homogenous"

paparazzi-commits

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

[paparazzi-commits] [5584] "making names homogenous"

From:	antoine drouin
Subject:	[paparazzi-commits] [5584] "making names homogenous"
Date:	Sun, 22 Aug 2010 20:56:47 +0000

Revision: 5584
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5584
Author:   poine
Date:     2010-08-22 20:56:46 +0000 (Sun, 22 Aug 2010)
Log Message:
-----------
"making names homogenous"

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/Poine/booz2_a1.xml

Added Paths:
-----------
    paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.0.makefile

Removed Paths:
-------------
    paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2v1.makefile

Modified: paparazzi3/trunk/conf/airframes/Poine/booz2_a1.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/booz2_a1.xml  2010-08-22 20:52:59 UTC 
(rev 5583)
+++ paparazzi3/trunk/conf/airframes/Poine/booz2_a1.xml  2010-08-22 20:56:46 UTC 
(rev 5584)
@@ -213,7 +213,7 @@
     </target> 
     <subsystem name="radio_control" type="ppm"/>
     <subsystem name="actuators"     type="mkk"/>
-    <subsystem name="imu"           type="b2v1"/>
+    <subsystem name="imu"           type="b2_v1.0"/>
     <subsystem name="gps"           type="ublox"/>
     <subsystem name="ahrs"          type="cmpl"/>
   </firmware>

Copied: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.0.makefile 
(from rev 5579, 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2v1.makefile)
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.0.makefile  
                        (rev 0)
+++ paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.0.makefile  
2010-08-22 20:56:46 UTC (rev 5584)
@@ -0,0 +1,71 @@
+#
+# Booz2 IMU booz2v1.0
+#
+#
+# required xml:
+#  <section name="IMU" prefix="IMU_">
+#
+#    <define name="GYRO_X_NEUTRAL" value="33924"/>
+#    <define name="GYRO_Y_NEUTRAL" value="33417"/>
+#    <define name="GYRO_Z_NEUTRAL" value="32809"/>
+#
+#    <define name="GYRO_X_SENS" value=" 1.01" integer="16"/>
+#    <define name="GYRO_Y_SENS" value="-1.01" integer="16"/>
+#    <define name="GYRO_Z_SENS" value="-1.01" integer="16"/>
+# 
+#    <define name="ACCEL_X_NEUTRAL" value="32081"/>
+#    <define name="ACCEL_Y_NEUTRAL" value="33738"/>
+#    <define name="ACCEL_Z_NEUTRAL" value="32441"/>
+#
+#    <define name="ACCEL_X_SENS" value="-2.50411474" integer="16"/>
+#    <define name="ACCEL_Y_SENS" value="-2.48126183" integer="16"/>
+#    <define name="ACCEL_Z_SENS" value="-2.51396167" integer="16"/>
+#
+#    <define name="MAG_X_NEUTRAL" value="2358"/>
+#    <define name="MAG_Y_NEUTRAL" value="2362"/> 
+#    <define name="MAG_Z_NEUTRAL" value="2119"/>
+#
+#    <define name="MAG_X_SENS" value="-3.4936416" integer="16"/>
+#    <define name="MAG_Y_SENS" value=" 3.607713" integer="16"/>
+#    <define name="MAG_Z_SENS" value="-4.90788848" integer="16"/>
+#    <define name="MAG_45_HACK" value="1"/> 
+#
+#  </section>
+#
+#
+
+# 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                   \
+           $(SRC_BOOZ)/imu/booz_imu_b2.c            \
+           $(SRC_BOOZ_ARCH)/imu/booz_imu_b2_arch.c
+
+ap.CFLAGS += -DMAX1168_EOC_VIC_SLOT=8
+ap.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
+           $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c
+
+ap.CFLAGS += -DUSE_AMI601
+ap.srcs += $(SRC_BOOZ)/peripherals/booz_ami601.c
+ap.CFLAGS += -DUSE_I2C1  -DI2C1_SCLL=150 -DI2C1_SCLH=150 -DI2C1_VIC_SLOT=11 
-DI2C1_BUF_LEN=16
+
+
+#
+# Simulator
+#
+
+sim.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
+sim.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_AMI601
+sim.srcs += $(SRC_BOOZ)/booz_imu.c                 \
+            $(SRC_BOOZ)/imu/booz_imu_b2.c          \
+            $(SRC_BOOZ_SIM)/imu/booz_imu_b2_arch.c
+
+
+sim.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
+            $(SRC_BOOZ_SIM)/peripherals/booz_max1168_arch.c
+
+sim.CFLAGS += -DUSE_AMI601
+sim.srcs += $(SRC_BOOZ)/peripherals/booz_ami601.c
+sim.CFLAGS += -DUSE_I2C1
\ No newline at end of file

Deleted: paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2v1.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2v1.makefile     
2010-08-22 20:52:59 UTC (rev 5583)
+++ paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2v1.makefile     
2010-08-22 20:56:46 UTC (rev 5584)
@@ -1,71 +0,0 @@
-#
-# Booz2 IMU booz2v1.0
-#
-#
-# required xml:
-#  <section name="IMU" prefix="IMU_">
-#
-#    <define name="GYRO_X_NEUTRAL" value="33924"/>
-#    <define name="GYRO_Y_NEUTRAL" value="33417"/>
-#    <define name="GYRO_Z_NEUTRAL" value="32809"/>
-#
-#    <define name="GYRO_X_SENS" value=" 1.01" integer="16"/>
-#    <define name="GYRO_Y_SENS" value="-1.01" integer="16"/>
-#    <define name="GYRO_Z_SENS" value="-1.01" integer="16"/>
-# 
-#    <define name="ACCEL_X_NEUTRAL" value="32081"/>
-#    <define name="ACCEL_Y_NEUTRAL" value="33738"/>
-#    <define name="ACCEL_Z_NEUTRAL" value="32441"/>
-#
-#    <define name="ACCEL_X_SENS" value="-2.50411474" integer="16"/>
-#    <define name="ACCEL_Y_SENS" value="-2.48126183" integer="16"/>
-#    <define name="ACCEL_Z_SENS" value="-2.51396167" integer="16"/>
-#
-#    <define name="MAG_X_NEUTRAL" value="2358"/>
-#    <define name="MAG_Y_NEUTRAL" value="2362"/> 
-#    <define name="MAG_Z_NEUTRAL" value="2119"/>
-#
-#    <define name="MAG_X_SENS" value="-3.4936416" integer="16"/>
-#    <define name="MAG_Y_SENS" value=" 3.607713" integer="16"/>
-#    <define name="MAG_Z_SENS" value="-4.90788848" integer="16"/>
-#    <define name="MAG_45_HACK" value="1"/> 
-#
-#  </section>
-#
-#
-
-# 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                   \
-           $(SRC_BOOZ)/imu/booz_imu_b2.c            \
-           $(SRC_BOOZ_ARCH)/imu/booz_imu_b2_arch.c
-
-ap.CFLAGS += -DMAX1168_EOC_VIC_SLOT=8
-ap.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
-           $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c
-
-ap.CFLAGS += -DUSE_AMI601
-ap.srcs += $(SRC_BOOZ)/peripherals/booz_ami601.c
-ap.CFLAGS += -DUSE_I2C1  -DI2C1_SCLL=150 -DI2C1_SCLH=150 -DI2C1_VIC_SLOT=11 
-DI2C1_BUF_LEN=16
-
-
-#
-# Simulator
-#
-
-sim.CFLAGS += -DBOOZ_IMU_TYPE_H=\"imu/booz_imu_b2.h\"
-sim.CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_AMI601
-sim.srcs += $(SRC_BOOZ)/booz_imu.c                 \
-            $(SRC_BOOZ)/imu/booz_imu_b2.c          \
-            $(SRC_BOOZ_SIM)/imu/booz_imu_b2_arch.c
-
-
-sim.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
-            $(SRC_BOOZ_SIM)/peripherals/booz_max1168_arch.c
-
-sim.CFLAGS += -DUSE_AMI601
-sim.srcs += $(SRC_BOOZ)/peripherals/booz_ami601.c
-sim.CFLAGS += -DUSE_I2C1
\ No newline at end of file

[Prev in Thread]

Current Thread

[Next in Thread]

[paparazzi-commits] [5584] "making names homogenous", antoine drouin <=

Prev by Date: [paparazzi-commits] [5583] moving booz2 files to rotorcraft
Next by Date: [paparazzi-commits] [5585] one more moving to rotorcraft
Previous by thread: [paparazzi-commits] [5583] moving booz2 files to rotorcraft
Next by thread: [paparazzi-commits] [5585] one more moving to rotorcraft
Index(es):
- Date
- Thread