[paparazzi-commits] [6334] making fixedwing build on lisa/M and lisa/L

[antoine drouin]

Revision: 6334
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6334
Author:   poine
Date:     2010-11-04 15:43:33 +0000 (Thu, 04 Nov 2010)
Log Message:
-----------
making fixedwing build on lisa/M and lisa/L

Modified Paths:
--------------
    
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_direct.makefile
    
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile
    paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/autopilot.makefile
    
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_direct.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_direct.makefile  
    2010-11-04 15:42:32 UTC (rev 6333)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_direct.makefile  
    2010-11-04 15:43:33 UTC (rev 6334)
@@ -8,6 +8,6 @@
 # Carefull: paths might get broken with this silly rotorcraft/fixedwing mixup 
of directories
 
 ifeq ($(ARCH), stm32)
-ap.srcs    += $(SRC_FIXEDWING)/booz/arch/stm32/actuators/actuators_pwm_arch.c
-ap.CFLAGS  += -I$(SRC_FIXEDWING)/booz/arch/stm32/
+ap.srcs    += firmwares/rotorcraft/actuators/arch/stm32/actuators_pwm_arch.c
+ap.CFLAGS  += -Ifirmwares/rotorcraft/actuators/arch/stm32
 endif

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile 
    2010-11-04 15:42:32 UTC (rev 6333)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/attitude_infrared.makefile 
    2010-11-04 15:43:33 UTC (rev 6334)
@@ -10,9 +10,25 @@
 # to change just redefine these before including this file
 #
 
+#
+# LPC only has one ADC
+#
+ifeq ($(ARCH), lpc21)
 ap.CFLAGS += -DADC_CHANNEL_IR1=$(ADC_IR1) -DUSE_$(ADC_IR1)
 ap.CFLAGS += -DADC_CHANNEL_IR2=$(ADC_IR2) -DUSE_$(ADC_IR2)
 ap.CFLAGS += -DADC_CHANNEL_IR_TOP=$(ADC_IR_TOP) -DUSE_$(ADC_IR_TOP)
+endif
+
+#
+# On STM32 let's hardwire infrared sensors to AD1 for now
+#
+ifeq ($(ARCH), stm32)
+ap.CFLAGS += -DUSE_AD1
+ap.CFLAGS += -DADC_CHANNEL_IR1=$(ADC_IR1) -DUSE_AD1_$(ADC_IR1)
+ap.CFLAGS += -DADC_CHANNEL_IR2=$(ADC_IR2) -DUSE_AD1_$(ADC_IR2)
+ap.CFLAGS += -DADC_CHANNEL_IR_TOP=$(ADC_IR_TOP) -DUSE_AD1_$(ADC_IR_TOP)
+endif
+
 ap.CFLAGS += -DADC_CHANNEL_IR_NB_SAMPLES=$(ADC_IR_NB_SAMPLES)
 
 $(TARGET).CFLAGS += -DINFRARED

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/autopilot.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/autopilot.makefile     
2010-11-04 15:42:32 UTC (rev 6333)
+++ paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/autopilot.makefile     
2010-11-04 15:43:33 UTC (rev 6334)
@@ -127,12 +127,12 @@
 # ANALOG
 #
 
-ifeq ($(ARCH), lpc21)
+#ifeq ($(ARCH), lpc21)
   ns_CFLAGS            += -DADC
   ns_srcs              += $(SRC_ARCH)/adc_hw.c
-else ifeq ($(ARCH), stm32)
-  ns_srcs              += lisa/lisa_analog_plug.c
-endif
+#else ifeq ($(ARCH), stm32)
+#  ns_srcs             += lisa/lisa_analog_plug.c
+#endif
 
 
 ######################################################################

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile 
    2010-11-04 15:42:32 UTC (rev 6333)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile 
    2010-11-04 15:43:33 UTC (rev 6334)
@@ -10,7 +10,10 @@
 
 
 ifeq ($(ARCH),stm32)
-  ap.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
+  ap.CFLAGS += -DRADIO_CONTROL
+ifdef RADIO_CONTROL_LED
+  ap.CFLAGS += -DRADIO_CONTROL_LED=$(RADIO_CONTROL_LED)
+endif
   ap.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"subsystems/radio_control/ppm.h\"
   ap.CFLAGS += -DRADIO_CONTROL_TYPE_PPM
   ap.srcs += $(SRC_SUBSYSTEMS)/radio_control.c \