[stm32] enable adcs again, but not working properly yet

This reverts commit cc859f9.
paparazzi · May 16, 2012 · f6cbc07 · f6cbc07
1 parent 46f7182
commit f6cbc07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/conf/firmwares/rotorcraft.makefile b/conf/firmwares/rotorcraft.makefile
@@ -167,10 +167,9 @@ ap.srcs   += subsystems/electrical.c
 ap.CFLAGS += -DUSE_DAC
 ap.srcs   += $(SRC_ARCH)/mcu_periph/dac_arch.c
 else ifeq ($(ARCH), stm32)
-#ap.CFLAGS += -DUSE_ADC
-#ap.CFLAGS += -DUSE_AD1 -DUSE_AD1_1 -DUSE_AD1_2 -DUSE_AD1_3 -DUSE_AD1_4
-#ap.CFLAGS += -DUSE_ADC1_2_IRQ_HANDLER
-#ap.srcs   += $(SRC_ARCH)/mcu_periph/adc_arch.c
+ap.CFLAGS += -DUSE_ADC
+ap.CFLAGS += -DUSE_AD1 -DUSE_AD1_1 -DUSE_AD1_2 -DUSE_AD1_3 -DUSE_AD1_4
+ap.srcs   += $(SRC_ARCH)/mcu_periph/adc_arch.c
 ap.srcs   += subsystems/electrical.c
 endif
 

diff --git a/sw/airborne/subsystems/electrical.c b/sw/airborne/subsystems/electrical.c
@@ -40,7 +40,7 @@ void electrical_init(void) {
   electrical.vsupply = 0;
   electrical.current = 0;
 
-  //adc_buf_channel(ADC_CHANNEL_VSUPPLY, &electrical_priv.vsupply_adc_buf, DEFAULT_AV_NB_SAMPLE);
+  adc_buf_channel(ADC_CHANNEL_VSUPPLY, &electrical_priv.vsupply_adc_buf, DEFAULT_AV_NB_SAMPLE);
 #ifdef ADC_CHANNEL_CURRENT
   adc_buf_channel(ADC_CHANNEL_CURRENT, &electrical_priv.current_adc_buf, DEFAULT_AV_NB_SAMPLE);
 #endif