[paparazzi-commits] [5569] making names homogenous

paparazzi-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [5569] making names homogenous

From:	antoine drouin
Subject:	[paparazzi-commits] [5569] making names homogenous
Date:	Sun, 22 Aug 2010 02:53:23 +0000
Revision: 5569
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5569
Author:   poine
Date:     2010-08-22 02:53:23 +0000 (Sun, 22 Aug 2010)
Log Message:
-----------
making names homogenous

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

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

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

Modified: paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml  2010-08-22 02:46:48 UTC 
(rev 5568)
+++ paparazzi3/trunk/conf/airframes/Poine/booz2_a7.xml  2010-08-22 02:53:23 UTC 
(rev 5569)
@@ -170,7 +170,7 @@
              
value="\\\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\\\""/>
     </subsystem>
     <subsystem name="actuators"     type="asctec"/>
-    <subsystem name="imu"           type="b2v1.1"/>
+    <subsystem name="imu"           type="b2_v1.1"/>
     <subsystem name="gps"           type="ublox"/>
     <subsystem name="ahrs"          type="cmpl"/>
   </firmware>
@@ -189,6 +189,12 @@
       <param name="TARGET_DIR"    value="~"/>
       <param name="PERIODIC_FREQ" value="512"/>
     </target>
+    <target name="stm_passthrough" board="lisa_l_1.0"/>
+      <subsystem name="radio_control" type="spektrum">
+        <param name="RADIO_CONTROL_SPEKTRUM_MODEL" 
+              
value="\\\"booz/radio_control/booz_radio_control_spektrum_dx7se.h\\\""/>
+      </subsystem>
+      <subsystem name="imu" type="b2_v1.1"/>
  </firmware>
 
  <makefile>

Copied: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile 
(from rev 5566, 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2v1.1.makefile)
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile  
                        (rev 0)
+++ paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2_v1.1.makefile  
2010-08-22 02:53:23 UTC (rev 5569)
@@ -0,0 +1,77 @@
+#
+# Booz2 IMU booz2v1.1
+#
+#
+# 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.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
+
+ap.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
+           $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c
+
+ap.srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c \
+           $(SRC_BOOZ_ARCH)/peripherals/booz_ms2001_arch.c
+
+# FIXME : that would lpc21
+#ifeq ($(ap.ARCH), arm7tmdi)
+ifeq ($(ARCHI), arm7)
+ap.CFLAGS += -DSSP_VIC_SLOT=9
+ap.CFLAGS += -DMAX1168_EOC_VIC_SLOT=8
+ap.CFLAGS += -DMS2001_DRDY_VIC_SLOT=11
+else ifeq ($(ARCHI), stm32) 
+ap.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ -DUSE_SPI2_IRQ
+endif
+
+#
+# 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

Deleted: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2v1.1.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2v1.1.makefile   
2010-08-22 02:46:48 UTC (rev 5568)
+++ paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/imu_b2v1.1.makefile   
2010-08-22 02:53:23 UTC (rev 5569)
@@ -1,77 +0,0 @@
-#
-# Booz2 IMU booz2v1.1
-#
-#
-# 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.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
-
-ap.srcs += $(SRC_BOOZ)/peripherals/booz_max1168.c \
-           $(SRC_BOOZ_ARCH)/peripherals/booz_max1168_arch.c
-
-ap.srcs += $(SRC_BOOZ)/peripherals/booz_ms2001.c \
-           $(SRC_BOOZ_ARCH)/peripherals/booz_ms2001_arch.c
-
-# FIXME : that would lpc21
-#ifeq ($(ap.ARCH), arm7tmdi)
-ifeq ($(ARCHI), arm7)
-ap.CFLAGS += -DSSP_VIC_SLOT=9
-ap.CFLAGS += -DMAX1168_EOC_VIC_SLOT=8
-ap.CFLAGS += -DMS2001_DRDY_VIC_SLOT=11
-else ifeq ($(ARCHI), stm32) 
-ap.CFLAGS += -DUSE_SPI2 -DUSE_DMA1_C4_IRQ -DUSE_EXTI2_IRQ -DUSE_SPI2_IRQ
-endif
-
-#
-# 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
[Prev in Thread]
Current Thread
[Next in Thread]
[paparazzi-commits] [5569] making names homogenous, antoine drouin <=
Prev by Date: [paparazzi-commits] [5568] making names homogenous
Next by Date: [paparazzi-commits] [5570] more updates to xml only things
Previous by thread: [paparazzi-commits] [5568] making names homogenous
Next by thread: [paparazzi-commits] [5570] more updates to xml only things
Index(es):
- Date
- Thread