From fa7bb9ef98e102ab4fbc5775d107bdd72fd4bd11 Mon Sep 17 00:00:00 2001
From: Felix Ruess <felix.ruess@gmail.com>
Date: Fri, 24 Dec 2010 16:03:08 +0100
Subject: [PATCH] fix comments in adc generic and update example airframe

---
 conf/airframes/easy_glider_example.xml |  3 +--
 conf/modules/adc_generic.xml           | 10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/conf/airframes/easy_glider_example.xml b/conf/airframes/easy_glider_example.xml
index b50f519ac1..313e793a84 100644
--- a/conf/airframes/easy_glider_example.xml
+++ b/conf/airframes/easy_glider_example.xml
@@ -180,8 +180,7 @@
 
   <modules>
     <load name="adc_generic.xml">
-      <define name="ADC_CHANNEL_GENERIC1" value="ADC_7"/> <!-- current sensor -->
-      <define name="USE_ADC_7"/>
+      <configure name="ADC_CHANNEL_GENERIC1" value="ADC_7"/> <!-- current sensor -->
     </load>
   </modules>
 
diff --git a/conf/modules/adc_generic.xml b/conf/modules/adc_generic.xml
index 77fa5d8c30..8f2917cf2b 100644
--- a/conf/modules/adc_generic.xml
+++ b/conf/modules/adc_generic.xml
@@ -2,9 +2,8 @@
 
 <!--
      Generic ADC module
-     @define ADC_CHANNEL_GENERIC1 on which ADC input 1 is measured
-     @define ADC_CHANNEL_GENERIC2 on which ADC input 2 is measured
-     @define USE_ADC_x  with x as the number of the ADC input (once for every ADC channel you want to use)
+     @configure ADC_CHANNEL_GENERIC1 on which ADC input 1 is measured
+     @configure ADC_CHANNEL_GENERIC2 on which ADC input 2 is measured
      -->
 
 <module name="adc_generic" dir="adcs">
@@ -20,12 +19,11 @@
 ifneq ($(ADC_CHANNEL_GENERIC1),)
 ap.CFLAGS += -DADC_CHANNEL_GENERIC1=$(ADC_CHANNEL_GENERIC1) -DUSE_$(ADC_CHANNEL_GENERIC1)
 endif
-    
+
 ifneq ($(ADC_CHANNEL_GENERIC2),)
 ap.CFLAGS += -DADC_CHANNEL_GENERIC2=$(ADC_CHANNEL_GENERIC2) -DUSE_$(ADC_CHANNEL_GENERIC2)
 endif
-    
+
     </raw>
   </makefile>
 </module>
-