[paparazzi-commits] [5935] fix typo in ppm makefile and prevent normal radio control from being used for stm32 targets

[Felix Ruess]

Revision: 5935
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5935
Author:   flixr
Date:     2010-09-23 22:28:29 +0000 (Thu, 23 Sep 2010)
Log Message:
-----------
fix typo in ppm makefile and prevent normal radio control from being used for 
stm32 targets

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml
    
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile

Modified: paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml        
2010-09-23 21:42:17 UTC (rev 5934)
+++ paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml        
2010-09-23 22:28:29 UTC (rev 5935)
@@ -194,8 +194,13 @@
 
     <!-- Sensors -->
     <subsystem name="radio_control"    type="ppm"/>
-<!--    <subsystem name="attitude"     type="infrared"/>
- -->
+    <!--<subsystem name="attitude"     type="infrared">
+      <param name="ADC_IR1"        value="ADC_1"/>
+      <param name="ADC_IR2"        value="ADC_2"/>
+      <param name="ADC_IR_TOP"     value="ADC_0"/>
+      <param name="ADC_IR_NB_SAMPLES" value="16"/>
+    </subsystem>-->
+
     <subsystem name="gps"              type="ublox_lea4p">
       <param name="GPS_UART_NR"                value="1"/>
     </subsystem>

Modified: 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile
===================================================================
--- 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile 
    2010-09-23 21:42:17 UTC (rev 5934)
+++ 
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile 
    2010-09-23 22:28:29 UTC (rev 5935)
@@ -3,21 +3,12 @@
 
 ifeq ($(BOARD),classix)
   ifeq ($(TARGET),ap)
-    NODRADIO = True
+    NORADIO = True
   endif
 endif
 
 
 
-ifeq ($(NORADIO), False)
-  $(TARGET).CFLAGS     += -DRADIO_CONTROL
-  $(TARGET).srcs       += $(SRC_FIXEDWING)/radio_control.c
-  ifneq ($(ARCH),jsbsim)
-    $(TARGET).srcs     += $(SRC_ARCH)/ppm_hw.c
-  endif
-endif
-
-
 ifeq ($(ARCH),stm32)
   ap.CFLAGS  += -I$(SRC_FIXEDWING)/booz/
   ap.CFLAGS  += -I$(SRC_FIXEDWING)/booz/arch/stm32/
@@ -30,4 +21,13 @@
              
$(SRC_FIXEDWING)/booz/arch/stm32/radio_control/booz_radio_control_ppm_arch.c
   ap.CFLAGS += -DUSE_TIM2_IRQ
 
+  NORADIO = True
 endif
+
+ifeq ($(NORADIO), False)
+  $(TARGET).CFLAGS     += -DRADIO_CONTROL
+  $(TARGET).srcs       += $(SRC_FIXEDWING)/radio_control.c
+  ifneq ($(ARCH),jsbsim)
+    $(TARGET).srcs     += $(SRC_ARCH)/ppm_hw.c
+  endif
+endif