IR sensor back on top

This commit is contained in:
Pascal Brisset
2007-10-13 08:15:06 +00:00
parent 3336fc31ce
commit 84f9906e3b
+5 -10
View File
@@ -44,12 +44,11 @@
</section>
<section name="adc" prefix="ADC_CHANNEL_">
<define name="IR1" value="ADC_2"/>
<define name="IR2" value="ADC_3"/>
<define name="IR1" value="ADC_0"/>
<define name="IR2" value="ADC_1"/>
<define name="IR_TOP" value="ADC_6"/>
<define name="IR_NB_SAMPLES" value="16"/>
<define name="GYRO_ROLL" value="ADC_4"/>
<define name="GYRO_TEMP" value="ADC_5"/>
<define name="GYRO_NB_SAMPLES" value="16"/>
</section>
@@ -59,13 +58,13 @@
<define name="PITCH_NEUTRAL_DEFAULT" value="2" unit="deg"/>
<define name="DEFAULT_CONTRAST" value="200"/>
<define name="RAD_OF_IR_CONTRAST" value="0.75"/>
<linear name="RollOfIrs" arity="2" coeff1="-0.66" coeff2="0.66"/>
<linear name="RollOfIrs" arity="2" coeff1="0.66" coeff2="-0.66"/>
<linear name="PitchOfIrs" arity="2" coeff1="-0.66" coeff2="-0.66"/>
<linear name="TopOfIr" arity="1" coeff1="-1"/>
<define name="RAD_OF_IR_MAX_VALUE" value="0.0045"/>
<define name="RAD_OF_IR_MIN_VALUE" value="0.00075"/>
<define name="ADC_ROLL_NEUTRAL" value="0"/>
<define name="ADC_PITCH_NEUTRAL" value="-675"/>
<define name="ADC_PITCH_NEUTRAL" value="-676"/>
<define name="ADC_TOP_NEUTRAL" value="512"/>
<define name="CORRECTION_UP" value="1.0"/>
@@ -236,12 +235,8 @@ ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c xbee.c
ap.CFLAGS += -DINTER_MCU
ap.srcs += inter_mcu.c
ap.CFLAGS += -DADC -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4 -DUSE_ADC_5 -DUSE_ADC_6
ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_4 -DUSE_ADC_6
ap.srcs += $(SRC_ARCH)/adc_hw.c
ap.CFLAGS += -DUSE_ADC_GENERIC -DADC_CHANNEL_GENERIC_NB_SAMPLES=16
ap.CFLAGS += -DUSE_ADC_0 -DADC_CHANNEL_GENERIC1=ADC_0
ap.CFLAGS += -DUSE_ADC_1 -DADC_CHANNEL_GENERIC2=ADC_1
ap.srcs += adc_generic.c
ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200