[paparazzi-commits] [4218] Enable pwm vane sensor for mercury_csc and disable ADC ( shared on the same pins)

[Allen Ibara]

Revision: 4218
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4218
Author:   aibara
Date:     2009-10-01 18:58:36 +0000 (Thu, 01 Oct 2009)
Log Message:
-----------
Enable pwm vane sensor for mercury_csc and disable ADC (shared on the same pins)

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/mercury_csc.xml
    paparazzi3/trunk/conf/autopilot/csc_ap.makefile

Modified: paparazzi3/trunk/conf/airframes/mercury_csc.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/mercury_csc.xml     2009-10-01 18:57:55 UTC 
(rev 4217)
+++ paparazzi3/trunk/conf/airframes/mercury_csc.xml     2009-10-01 18:58:36 UTC 
(rev 4218)
@@ -46,6 +46,8 @@
 ap.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 
 include $(PAPARAZZI_SRC)/conf/autopilot/mercury_csc.makefile
+include $(PAPARAZZI_SRC)/conf/autopilot/pwm_input.makefile
+include $(PAPARAZZI_SRC)/conf/autopilot/vane_sensor.makefile
 
 
   </makefile>

Modified: paparazzi3/trunk/conf/autopilot/csc_ap.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/csc_ap.makefile     2009-10-01 18:57:55 UTC 
(rev 4217)
+++ paparazzi3/trunk/conf/autopilot/csc_ap.makefile     2009-10-01 18:58:36 UTC 
(rev 4218)
@@ -73,7 +73,7 @@
 ap.CFLAGS += -DXSENS1_LINK=Uart0
 
 ap.CFLAGS += -DAP_LINK_CAN -DCAN_LED=2
-ap.CFLAGS += -DUSE_CAN1 -DCAN1_BTR=CANBitrate125k_3MHz
+ap.CFLAGS += -DUSE_CAN1 -DCAN1_BTR=CANBitrate125k_2MHz
 ap.CFLAGS +=  -DCAN1_VIC_SLOT=3 -DCAN1_ERR_VIC_SLOT=7
 ap.srcs += $(SRC_CSC)/csc_can.c
 #ap.CFLAGS += -DUSE_CAN2 -DCAN2_BTR=CANBitrate125k_2MHz -DCAN2_VIC_SLOT=4