[paparazzi-commits] [5586] and one more

[antoine drouin]

Revision: 5586
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5586
Author:   poine
Date:     2010-08-22 21:05:27 +0000 (Sun, 22 Aug 2010)
Log Message:
-----------
and one more

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

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

Deleted: 
paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec_v2.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec_v2.makefile   
    2010-08-22 21:01:41 UTC (rev 5585)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec_v2.makefile   
    2010-08-22 21:05:27 UTC (rev 5586)
@@ -1,32 +0,0 @@
-# asctec controllers v2
-#
-#  <section name="SUPERVISION" prefix="SUPERVISION_">
-#    <define name="MIN_MOTOR" value="2"/>
-#    <define name="MAX_MOTOR" value="210"/>
-#    <define name="TRIM_A" value="2"/>
-#    <define name="TRIM_E" value="-1"/>
-#    <define name="TRIM_R" value="3"/>
-#    <define name="NB_MOTOR" value="4"/>
-#    <define name="SCALE" value="256"/>
-#    <define name="ROLL_COEF"   value="{    0,    0, -256,  256}"/>
-#    <define name="PITCH_COEF"  value="{ 256,  -256,    0,    0}"/>
-#    <define name="YAW_COEF"    value="{-256,  -256,  256,  256}"/>
-#    <define name="THRUST_COEF" value="{ 256,   256,  256,  256}"/>
-#  </section>
-#
-#
-
-ap.srcs += $(SRC_BOOZ)/actuators/booz_supervision.c
-ap.CFLAGS += -DACTUATORS_ASCTEC_V2_PROTOCOL
-ap.srcs += $(SRC_BOOZ)/actuators/booz_actuators_asctec.c
-ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
-
-ifeq ($(ARCHI), arm7)
-ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c0
-ap.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10
-endif
-
-ifeq ($(ARCHI), stm32) 
-ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c1
-ap.CFLAGS += -DUSE_I2C1
-endif

Copied: 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile
 (from rev 5579, 
paparazzi3/trunk/conf/autopilot/subsystems/booz2_actuators_asctec_v2.makefile)
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile
                          (rev 0)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/rotorcraft/actuators_asctec_v2.makefile
  2010-08-22 21:05:27 UTC (rev 5586)
@@ -0,0 +1,32 @@
+# asctec controllers v2
+#
+#  <section name="SUPERVISION" prefix="SUPERVISION_">
+#    <define name="MIN_MOTOR" value="2"/>
+#    <define name="MAX_MOTOR" value="210"/>
+#    <define name="TRIM_A" value="2"/>
+#    <define name="TRIM_E" value="-1"/>
+#    <define name="TRIM_R" value="3"/>
+#    <define name="NB_MOTOR" value="4"/>
+#    <define name="SCALE" value="256"/>
+#    <define name="ROLL_COEF"   value="{    0,    0, -256,  256}"/>
+#    <define name="PITCH_COEF"  value="{ 256,  -256,    0,    0}"/>
+#    <define name="YAW_COEF"    value="{-256,  -256,  256,  256}"/>
+#    <define name="THRUST_COEF" value="{ 256,   256,  256,  256}"/>
+#  </section>
+#
+#
+
+ap.srcs += $(SRC_BOOZ)/actuators/booz_supervision.c
+ap.CFLAGS += -DACTUATORS_ASCTEC_V2_PROTOCOL
+ap.srcs += $(SRC_BOOZ)/actuators/booz_actuators_asctec.c
+ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
+
+ifeq ($(ARCHI), arm7)
+ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c0
+ap.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=10
+endif
+
+ifeq ($(ARCHI), stm32) 
+ap.CFLAGS += -DACTUATORS_ASCTEC_DEVICE=i2c1
+ap.CFLAGS += -DUSE_I2C1
+endif