paparazzi-commits
[Top][All Lists]
Advanced

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

[paparazzi-commits] [6313] renamed twog board from "twog_1" to "twog_1.0


From: Felix Ruess
Subject: [paparazzi-commits] [6313] renamed twog board from "twog_1" to "twog_1.0", please update
Date: Sun, 31 Oct 2010 23:25:11 +0000

Revision: 6313
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6313
Author:   flixr
Date:     2010-10-31 23:25:11 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
renamed twog board from "twog_1" to "twog_1.0", please update

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/easystar_ets_example.xml
    paparazzi3/trunk/conf/airframes/easystar_example.xml
    paparazzi3/trunk/conf/airframes/mentor_tum.xml
    paparazzi3/trunk/conf/airframes/twinjet_example.xml
    paparazzi3/trunk/conf/airframes/twinjet_overo.xml
    paparazzi3/trunk/conf/airframes/twinstar_example.xml
    paparazzi3/trunk/conf/autopilot/fixedwing.xml
    paparazzi3/trunk/conf/boards/twog_1.makefile
    paparazzi3/trunk/sw/airborne/Makefile

Added Paths:
-----------
    paparazzi3/trunk/conf/boards/twog_1.0.makefile

Modified: paparazzi3/trunk/conf/airframes/easystar_ets_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/easystar_ets_example.xml    2010-10-31 
23:25:00 UTC (rev 6312)
+++ paparazzi3/trunk/conf/airframes/easystar_ets_example.xml    2010-10-31 
23:25:11 UTC (rev 6313)
@@ -10,7 +10,7 @@
 <airframe name="EasyStar2 - TWOG v1">
 
   <firmware name="fixedwing">
-    <target name="ap"                  board="twog_1">
+    <target name="ap"                  board="twog_1.0">
       <define name="AGR_CLIMB"/>
       <define name="LOITER_TRIM"/>
       <define name="WIND_INFO"/>
@@ -38,8 +38,8 @@
   </firmware>
 
   <firmware name="setup">
-    <target name="tunnel"              board="twog_1" />
-    <target name="setup_actuators"     board="twog_1" />
+    <target name="tunnel"              board="twog_1.0" />
+    <target name="setup_actuators"     board="twog_1.0" />
   </firmware>
 
   <modules>

Modified: paparazzi3/trunk/conf/airframes/easystar_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/easystar_example.xml        2010-10-31 
23:25:00 UTC (rev 6312)
+++ paparazzi3/trunk/conf/airframes/easystar_example.xml        2010-10-31 
23:25:11 UTC (rev 6313)
@@ -10,7 +10,7 @@
 <airframe name="EasyStar TWOGv1">
 
   <firmware name="fixedwing">
-    <target name="ap"                  board="twog_1">
+    <target name="ap"                  board="twog_1.0">
       <define name="LOITER_TRIM"/>
       <define name="ALT_KALMAN"/>
     </target>
@@ -29,8 +29,8 @@
   </firmware>
 
   <firmware name="setup">
-    <target name="tunnel"              board="twog_1"/>
-    <target name="setup_actuators"     board="twog_1"/>
+    <target name="tunnel"              board="twog_1.0"/>
+    <target name="setup_actuators"     board="twog_1.0"/>
   </firmware>
 
 <!-- commands section -->

Modified: paparazzi3/trunk/conf/airframes/mentor_tum.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/mentor_tum.xml      2010-10-31 23:25:00 UTC 
(rev 6312)
+++ paparazzi3/trunk/conf/airframes/mentor_tum.xml      2010-10-31 23:25:11 UTC 
(rev 6313)
@@ -10,7 +10,7 @@
 <airframe name="Mentor Twog AkaModell">
 
   <firmware name="fixedwing">
-    <target name="ap"                  board="twog_1">
+    <target name="ap"                  board="twog_1.0">
       <define name="AGR_CLIMB"/>
       <define name="LOITER_TRIM"/>
       <define name="WIND_INFO"/>

Modified: paparazzi3/trunk/conf/airframes/twinjet_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/twinjet_example.xml 2010-10-31 23:25:00 UTC 
(rev 6312)
+++ paparazzi3/trunk/conf/airframes/twinjet_example.xml 2010-10-31 23:25:11 UTC 
(rev 6313)
@@ -11,7 +11,7 @@
 <airframe name="Twinjet">
 
   <firmware name="fixedwing">
-    <target name="ap"                  board="twog_1">
+    <target name="ap"                  board="twog_1.0">
       <define name="LOITER_TRIM"/>
       <define name="ALT_KALMAN"/>
       <define name="AGR_CLIMB"/>
@@ -33,10 +33,10 @@
   </firmware>
 
   <firmware name="setup">
-    <target name="tunnel"           board="twog_1" />
-    <target name="usb_tunnel_0"     board="twog_1" />
-    <target name="usb_tunnel_1"     board="twog_1" />
-    <target name="setup_actuators"  board="twog_1" />
+    <target name="tunnel"           board="twog_1.0" />
+    <target name="usb_tunnel_0"     board="twog_1.0" />
+    <target name="usb_tunnel_1"     board="twog_1.0" />
+    <target name="setup_actuators"  board="twog_1.0" />
   </firmware>
 
   <servos>

Modified: paparazzi3/trunk/conf/airframes/twinjet_overo.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/twinjet_overo.xml   2010-10-31 23:25:00 UTC 
(rev 6312)
+++ paparazzi3/trunk/conf/airframes/twinjet_overo.xml   2010-10-31 23:25:11 UTC 
(rev 6313)
@@ -11,7 +11,7 @@
 <airframe name="Twinjet">
 
   <firmware name="fixedwing">
-    <target name="ap"                  board="twog_1">
+    <target name="ap"                  board="twog_1.0">
       <define name="LOITER_TRIM"/>
       <define name="ALT_KALMAN"/>
       <define name="AGR_CLIMB"/>
@@ -42,8 +42,8 @@
   </firmware>
 
   <firmware name="setup">
-    <target name="tunnel"              board="twog_1" />
-    <target name="setup_actuators"     board="twog_1" />
+    <target name="tunnel"              board="twog_1.0" />
+    <target name="setup_actuators"     board="twog_1.0" />
   </firmware>
 
   <modules>

Modified: paparazzi3/trunk/conf/airframes/twinstar_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/twinstar_example.xml        2010-10-31 
23:25:00 UTC (rev 6312)
+++ paparazzi3/trunk/conf/airframes/twinstar_example.xml        2010-10-31 
23:25:11 UTC (rev 6313)
@@ -12,7 +12,7 @@
 <airframe name="Twinstar">
 
   <firmware name="fixedwing">
-    <target name="ap"                  board="twog_1">
+    <target name="ap"                  board="twog_1.0">
       <define name="LOITER_TRIM"/>
       <define name="ALT_KALMAN"/>
       <define name="AGR_CLIMB"/>
@@ -33,8 +33,8 @@
   </firmware>
 
   <firmware name="setup">
-    <target name="tunnel"              board="twog_1"/>
-    <target name="setup_actuators"     board="twog_1"/>
+    <target name="tunnel"              board="twog_1.0"/>
+    <target name="setup_actuators"     board="twog_1.0"/>
   </firmware>
 
 <!-- commands section -->

Modified: paparazzi3/trunk/conf/autopilot/fixedwing.xml
===================================================================
--- paparazzi3/trunk/conf/autopilot/fixedwing.xml       2010-10-31 23:25:00 UTC 
(rev 6312)
+++ paparazzi3/trunk/conf/autopilot/fixedwing.xml       2010-10-31 23:25:11 UTC 
(rev 6313)
@@ -1,4 +1,4 @@
-<firmware name="fixedwing" 
boards="|twog_1|tiny_2.11|tiny_2.1|tiny_1.1|tiny_0.99|booz_1.0|lisa_l_1.0|pc|"
+<firmware name="fixedwing" 
boards="|twog_1.0|tiny_2.11|tiny_2.1|tiny_1.1|tiny_0.99|booz_1.0|lisa_l_1.0|pc|"
   description="autopilot and simulator for fixed wing vehicles">
 
 

Copied: paparazzi3/trunk/conf/boards/twog_1.0.makefile (from rev 6312, 
paparazzi3/trunk/conf/boards/twog_1.makefile)
===================================================================
--- paparazzi3/trunk/conf/boards/twog_1.0.makefile                              
(rev 0)
+++ paparazzi3/trunk/conf/boards/twog_1.0.makefile      2010-10-31 23:25:11 UTC 
(rev 6313)
@@ -0,0 +1,12 @@
+#
+# twog_1.0.makefile
+#
+# http://paparazzi.enac.fr/wiki/Twog_v1
+#
+
+include $(PAPARAZZI_SRC)/conf/boards/tiny_2.11.makefile
+
+BOARD=twog
+BOARD_VERSION=1.0
+
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"

Modified: paparazzi3/trunk/conf/boards/twog_1.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/twog_1.makefile        2010-10-31 23:25:00 UTC 
(rev 6312)
+++ paparazzi3/trunk/conf/boards/twog_1.makefile        2010-10-31 23:25:11 UTC 
(rev 6313)
@@ -1,12 +1,2 @@
-#
-# twog_1.makefile
-#
-# http://paparazzi.enac.fr/wiki/Twog_v1
-#
-
-include $(PAPARAZZI_SRC)/conf/boards/tiny_2.11.makefile
-
-BOARD=twog
-BOARD_VERSION=1.0
-
-BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+# print error because of rename
+ $(error Please rename the board from "twog_1" to twog_1.0", e.g. <target 
name="ap" board="twog_1.0"/> in your airframe config!)

Modified: paparazzi3/trunk/sw/airborne/Makefile
===================================================================
--- paparazzi3/trunk/sw/airborne/Makefile       2010-10-31 23:25:00 UTC (rev 
6312)
+++ paparazzi3/trunk/sw/airborne/Makefile       2010-10-31 23:25:11 UTC (rev 
6313)
@@ -38,7 +38,7 @@
 
 # check if ARCHDIR is set
   ifeq ($($(TARGET).ARCHDIR), )
-    $(error Architecture not set, maybe you forgot to add the target? e.g. 
<target name="tunnel" board="twog_1"/>)
+    $(error Architecture not set, maybe you forgot to add the target? e.g. 
<target name="tunnel" board="twog_1.0"/>)
   else
     include ../../conf/Makefile.$($(TARGET).ARCHDIR)
   endif




reply via email to

[Prev in Thread] Current Thread [Next in Thread]