[paparazzi-commits] [5656] actuators automatic based on board

paparazzi-commits

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paparazzi-commits] [5656] actuators automatic based on board

From:	Christophe De Wagter
Subject:	[paparazzi-commits] [5656] actuators automatic based on board
Date:	Tue, 24 Aug 2010 13:11:19 +0000

Revision: 5656
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5656
Author:   dewagter
Date:     2010-08-24 13:11:19 +0000 (Tue, 24 Aug 2010)
Log Message:
-----------
actuators automatic based on board

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
    paparazzi3/trunk/conf/airframes/microjet_example.xml
    paparazzi3/trunk/conf/autopilot/fixedwing.makefile
    paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile
    paparazzi3/trunk/conf/boards/pc.makefile
    paparazzi3/trunk/conf/boards/tiny_0.99.makefile
    paparazzi3/trunk/conf/boards/tiny_1.1.makefile
    paparazzi3/trunk/conf/boards/tiny_2.1.makefile
    paparazzi3/trunk/conf/boards/tiny_2.11.makefile
    paparazzi3/trunk/conf/boards/twog_1.makefile

Modified: paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-08-24 12:21:15 UTC (rev 5655)
+++ paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml        
2010-08-24 13:11:19 UTC (rev 5656)
@@ -176,7 +176,6 @@
     </subsystem>
 
     <!-- Actuators -->
-    <subsystem name="actuators"        type="4017"/>
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="gyro"      type="roll"/>

Modified: paparazzi3/trunk/conf/airframes/microjet_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/microjet_example.xml        2010-08-24 
12:21:15 UTC (rev 5655)
+++ paparazzi3/trunk/conf/airframes/microjet_example.xml        2010-08-24 
13:11:19 UTC (rev 5656)
@@ -176,7 +176,6 @@
     </subsystem>
 
     <!-- Actuators -->
-    <subsystem name="actuators"        type="4017"/>
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="gyro"          type="roll"/>

Modified: paparazzi3/trunk/conf/autopilot/fixedwing.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/fixedwing.makefile  2010-08-24 12:21:15 UTC 
(rev 5655)
+++ paparazzi3/trunk/conf/autopilot/fixedwing.makefile  2010-08-24 13:11:19 UTC 
(rev 5656)
@@ -15,9 +15,27 @@
 FIXEDWING_INC = -I$(SRC_FIXEDWING) -I$(SRC_FIXEDWING_ARCH)
 
 
+
 # Standard Fixed Wing Code
 include $(CFG_FIXEDWING)/autopilot.makefile
 
 
+ifeq ($(BOARD),tiny)
 
+  ifeq ($(BOARD_VERSION),1.1)
+    include $(CFG_FIXEDWING)/actuators_4015.makefile
+  else
+    ifeq ($(BOARD_VERSION),0.99)
+      include $(CFG_FIXEDWING)/actuators_4015.makefile
+    else
+      include $(CFG_FIXEDWING)/actuators_4017.makefile
+    endif
+  endif
+endif
 
+ifeq ($(BOARD),lisa_l)
+    include $(CFG_FIXEDWING)/actuators_lisa.makefile
+endif
+
+
+

Modified: paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile    2010-08-24 12:21:15 UTC 
(rev 5655)
+++ paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile    2010-08-24 13:11:19 UTC 
(rev 5656)
@@ -4,6 +4,9 @@
 # http://paparazzi.enac.fr/wiki/User/LisaL
 #
 
+BOARD=lisa_l
+BOARD_VERSION=1.0
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
 # -----------------------------------------------------------------------
 ifeq ($(BOARD_PROCESSOR),'omap')
@@ -16,9 +19,6 @@
 
        ARCH=stm32
        ARCHI=stm32
-       BOARD=lisa_l
-       BOARD_VERSION=1.0
-       BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
        $(TARGET).ARCHDIR = $(ARCHI)
 # not needed?

Modified: paparazzi3/trunk/conf/boards/pc.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/pc.makefile    2010-08-24 12:21:15 UTC (rev 
5655)
+++ paparazzi3/trunk/conf/boards/pc.makefile    2010-08-24 13:11:19 UTC (rev 
5656)
@@ -7,6 +7,10 @@
 ARCH=sim
 ARCHI=sim
 BOARD = pc
+BOARD_VERSION=
+
+
+# TODO: update board
 BOARD_CFG = \"tiny.h\"
 
 

Modified: paparazzi3/trunk/conf/boards/tiny_0.99.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_0.99.makefile     2010-08-24 12:21:15 UTC 
(rev 5655)
+++ paparazzi3/trunk/conf/boards/tiny_0.99.makefile     2010-08-24 13:11:19 UTC 
(rev 5656)
@@ -7,7 +7,15 @@
 
 include $(PAPARAZZI_SRC)/conf/boards/tiny_2.11.makefile
 
+
+BOARD=tiny
+BOARD_VERSION=0.99
+
+#BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+
+# TODO: update syntax
 BOARD_CFG = \"tiny_0_99.h\"
 
+
 GPS_UART_NR    = 1
 MODEM_UART_NR = 0

Modified: paparazzi3/trunk/conf/boards/tiny_1.1.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_1.1.makefile      2010-08-24 12:21:15 UTC 
(rev 5655)
+++ paparazzi3/trunk/conf/boards/tiny_1.1.makefile      2010-08-24 13:11:19 UTC 
(rev 5656)
@@ -7,6 +7,13 @@
 
 include $(PAPARAZZI_SRC)/conf/boards/tiny_2.11.makefile
 
+
+BOARD=tiny
+BOARD_VERSION=1.1
+
+#BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+
+# TODO: update syntax
 BOARD_CFG = \"tiny_1_1.h\"
 
 GPS_UART_NR    = 1

Modified: paparazzi3/trunk/conf/boards/tiny_2.1.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_2.1.makefile      2010-08-24 12:21:15 UTC 
(rev 5655)
+++ paparazzi3/trunk/conf/boards/tiny_2.1.makefile      2010-08-24 13:11:19 UTC 
(rev 5656)
@@ -6,6 +6,13 @@
 
 include $(PAPARAZZI_SRC)/conf/boards/tiny_2.11.makefile
 
+
+BOARD=tiny
+BOARD_VERSION=2.1
+
+#BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+
+# TODO: update syntax
 BOARD_CFG = \"tiny_2_1.h\"
 
 

Modified: paparazzi3/trunk/conf/boards/tiny_2.11.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_2.11.makefile     2010-08-24 12:21:15 UTC 
(rev 5655)
+++ paparazzi3/trunk/conf/boards/tiny_2.11.makefile     2010-08-24 13:11:19 UTC 
(rev 5656)
@@ -7,6 +7,14 @@
 # ARCH=lpc21
 ARCH=arm7
 ARCHI=arm7
+
+
+BOARD=tiny
+BOARD_VERSION=2.11
+
+#BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+
+# TODO: update syntax
 BOARD_CFG = \"tiny_2_1_1.h\"
 
 ifndef FLASH_MODE

Modified: paparazzi3/trunk/conf/boards/twog_1.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/twog_1.makefile        2010-08-24 12:21:15 UTC 
(rev 5655)
+++ paparazzi3/trunk/conf/boards/twog_1.makefile        2010-08-24 13:11:19 UTC 
(rev 5656)
@@ -6,5 +6,10 @@
 
 include $(PAPARAZZI_SRC)/conf/boards/tiny_2.11.makefile
 
+BOARD=twog
+BOARD_VERSION=1.0
 
+#BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+
+# TODO: update syntax
 BOARD_CFG = \"twog_v1.h\"

[Prev in Thread]

Current Thread

[Next in Thread]

[paparazzi-commits] [5656] actuators automatic based on board, Christophe De Wagter <=

Prev by Date: [paparazzi-commits] [5655] add params to modules
Next by Date: [paparazzi-commits] [5657] en route pour le nouveau FMS
Previous by thread: [paparazzi-commits] [5655] add params to modules
Next by thread: [paparazzi-commits] [5657] en route pour le nouveau FMS
Index(es):
- Date
- Thread