[paparazzi-commits] [5465] Add battery monitor bits to mercury CSC

[Allen Ibara]

Revision: 5465
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5465
Author:   aibara
Date:     2010-08-19 03:21:29 +0000 (Thu, 19 Aug 2010)
Log Message:
-----------
Add battery monitor bits to mercury CSC

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

Modified: paparazzi3/trunk/conf/autopilot/mercury_csc.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/mercury_csc.makefile        2010-08-19 
03:20:48 UTC (rev 5464)
+++ paparazzi3/trunk/conf/autopilot/mercury_csc.makefile        2010-08-19 
03:21:29 UTC (rev 5465)
@@ -54,9 +54,11 @@
 
 ap.CFLAGS += -DCSC_BOARD_ID=$(CSC_ID)
 
-# ap.CFLAGS += -DUSE_PWM_INPUT -DUSE_VANE_SENSOR
+ap.CFLAGS += -DUSE_PWM_INPUT 
+ap.CFLAGS += -DUSE_PWM_INPUT1
+ap.CFLAGS += -DUSE_PWM_INPUT2
 ap.CFLAGS += -DUSE_VANE_SENSOR
-ap.CFLAGS += -DUSE_BAT_MONITOR
+# ap.CFLAGS += -DUSE_BAT_MONITOR
 
 ap.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC((1./512.))' 
-DTIMER0_VIC_SLOT=1
 ap.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c