[paparazzi-commits] [4882] movin stuff around

[antoine drouin]

Revision: 4882
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4882
Author:   poine
Date:     2010-04-27 18:20:49 +0000 (Tue, 27 Apr 2010)
Log Message:
-----------
movin stuff around

Added Paths:
-----------
    paparazzi3/trunk/conf/airframes/Poine/bl_mc.xml
    paparazzi3/trunk/conf/airframes/Poine/motor_bench.xml
    paparazzi3/trunk/conf/airframes/Poine/pt_ant.xml

Removed Paths:
-------------
    paparazzi3/trunk/conf/airframes/bipbip.xml
    paparazzi3/trunk/conf/airframes/bl_mc.xml
    paparazzi3/trunk/conf/airframes/motor_bench.xml
    paparazzi3/trunk/conf/airframes/pt_ant.xml

Copied: paparazzi3/trunk/conf/airframes/Poine/bl_mc.xml (from rev 4881, 
paparazzi3/trunk/conf/airframes/bl_mc.xml)
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/bl_mc.xml                             
(rev 0)
+++ paparazzi3/trunk/conf/airframes/Poine/bl_mc.xml     2010-04-27 18:20:49 UTC 
(rev 4882)
@@ -0,0 +1,49 @@
+<!-- dc motor controller -->
+<airframe name="bl_mc">
+
+  <makefile>
+
+ARCHI=avr
+
+main.ARCHDIR=$(ARCHI)
+main.ARCH = atmega128
+main.TARGET = main
+main.TARGETDIR = main
+
+# internal RC 8MHz
+LOW_FUSE  = e4
+HIGH_FUSE = 99
+EXT_FUSE  = ff
+LOCK_FUSE = ff
+
+# 16MHz ceramic reso with longest startup
+#LOW_FUSE  = cf
+#HIGH_FUSE = 89
+#EXT_FUSE  = ff
+#LOCK_FUSE = ff
+
+main.CFLAGS += -DBOARD_CONFIG=\"conf_bl_mc.h\"
+main.srcs = main_bl_mc.c
+
+main.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1e-2)'
+main.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
+
+main.CFLAGS += -DLED 
+#-DTIME_LED=1
+
+main.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B38400
+main.srcs += $(SRC_ARCH)/uart_hw.c
+
+main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport 
-DDOWNLINK_DEVICE=Uart1 
+main.srcs += downlink.c pprz_transport.c
+
+main.srcs += $(SRC_ARCH)/bl_mc_power.c
+
+main.srcs += $(SRC_ARCH)/bl_mc_timer.c
+
+main.CFLAGS += -D_32KHZ
+main.srcs += $(SRC_ARCH)/bl_mc_pwm.c
+
+</makefile>
+
+</airframe>
\ No newline at end of file

Copied: paparazzi3/trunk/conf/airframes/Poine/motor_bench.xml (from rev 4881, 
paparazzi3/trunk/conf/airframes/motor_bench.xml)
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/motor_bench.xml                       
        (rev 0)
+++ paparazzi3/trunk/conf/airframes/Poine/motor_bench.xml       2010-04-27 
18:20:49 UTC (rev 4882)
@@ -0,0 +1,104 @@
+<airframe name="MOTOR_BENCH">
+
+  <makefile>
+
+ARCHI=arm7
+
+FLASH_MODE = IAP
+
+MB=motor_bench
+
+main.ARCHDIR = $(ARCHI)
+main.ARCH = arm7tdmi
+main.TARGET = mb
+main.TARGETDIR = mb
+
+main.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
+main.srcs = $(MB)/main_motor_bench.c
+
+main.CFLAGS += -DPERIODIC_TASK_FREQ='250.'
+main.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./PERIODIC_TASK_FREQ)'
+main.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
+
+main.CFLAGS += -DLED
+
+main.srcs += $(SRC_ARCH)/armVIC.c
+
+main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B115200
+main.srcs += $(SRC_ARCH)/uart_hw.c
+
+main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport 
-DDOWNLINK_DEVICE=Uart0 
+main.srcs += downlink.c pprz_transport.c
+
+main.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
+
+main.srcs += $(MB)/mb_servo.c
+
+main.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=3
+main.CFLAGS += -DUSE_TWI_CONTROLLER
+#main.CFLAGS += -DI2C_SCLL=100 -DI2C_SCLH=100
+#main.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller.c
+main.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_asctech.c
+#main.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_mkk.c
+
+main.CFLAGS += -DMB_TACHO
+main.srcs += $(MB)/mb_tacho.c
+
+main.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1
+main.srcs += $(SRC_ARCH)/adc_hw.c
+main.srcs += $(MB)/mb_current.c
+
+main.CFLAGS += -DMB_SCALE
+main.srcs += $(MB)/mb_scale.c
+
+main.srcs += $(MB)/mb_modes.c
+#main.srcs += $(MB)/mb_static.c
+#main.srcs += $(MB)/mb_mode_fixed_rpm.c
+
+foo.ARCHDIR = $(ARCHI)
+foo.ARCH = arm7tdmi
+foo.TARGET = mb
+foo.TARGETDIR = mb
+
+foo.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
+foo.srcs = $(MB)/main_foo.c
+
+foo.CFLAGS += -DPERIODIC_TASK_FREQ='250.'
+foo.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./PERIODIC_TASK_FREQ)'
+foo.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
+
+foo.CFLAGS += -DLED
+foo.srcs += $(SRC_ARCH)/armVIC.c
+
+foo.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=9
+foo.CFLAGS += -DUSE_TWI_CONTROLLER
+foo.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_asctech.c
+
+
+
+
+bar.ARCHDIR = $(ARCHI)
+bar.ARCH = arm7tdmi
+bar.TARGET = mb
+bar.TARGETDIR = mb
+
+bar.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
+bar.srcs = $(MB)/main_bar.c
+
+bar.CFLAGS += -DPERIODIC_TASK_FREQ='250.'
+bar.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./PERIODIC_TASK_FREQ)'
+bar.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
+
+bar.CFLAGS += -DLED
+bar.srcs += $(SRC_ARCH)/armVIC.c
+
+bar.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=9
+bar.CFLAGS += -DUSE_TWI_CONTROLLER
+bar.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_mkk.c
+
+
+
+
+  </makefile>
+
+</airframe>

Copied: paparazzi3/trunk/conf/airframes/Poine/pt_ant.xml (from rev 4881, 
paparazzi3/trunk/conf/airframes/pt_ant.xml)
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/pt_ant.xml                            
(rev 0)
+++ paparazzi3/trunk/conf/airframes/Poine/pt_ant.xml    2010-04-27 18:20:49 UTC 
(rev 4882)
@@ -0,0 +1,63 @@
+<airframe name="pt_ant">
+
+<section name="DATALINK" prefix="DATALINK_">
+    <define name="DEVICE_TYPE" value="PPRZ"/>
+    <define name="DEVICE_ADDRESS" value="...."/>
+</section>
+
+
+  <makefile>
+
+tunnel.ARCHDIR = $(ARCHI)
+tunnel.ARCH = arm7tdmi
+tunnel.TARGET = tunnel
+tunnel.TARGETDIR = tunnel
+
+tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"conf_demo.h\" -DLED -DTIME_LED=1
+tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
+
+ARCHI=arm7
+
+FLASH_MODE = IAP
+PT_ANT = antenna
+
+main.ARCHDIR = $(ARCHI)
+main.ARCH = arm7tdmi
+main.TARGET = main
+main.TARGETDIR = main
+
+main.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(PT_ANT)
+main.srcs = $(PT_ANT)/pt_ant_main.c
+
+main.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1.66666667e-2)'
+main.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
+
+main.CFLAGS += -DLED
+
+main.srcs += $(SRC_ARCH)/armVIC.c
+
+main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
+main.srcs += $(SRC_ARCH)/uart_hw.c
+
+main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport 
-DDOWNLINK_DEVICE=Uart0 
+main.srcs += downlink.c pprz_transport.c $(PT_ANT)/pt_ant_telemetry.c
+
+main.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
+main.srcs += $(PT_ANT)/pt_ant_datalink.c
+
+main.srcs += $(PT_ANT)/pt_ant_motors.c
+
+main.CFLAGS += -DUSE_AMI601 -DI2C_BUF_LEN=32
+main.srcs += AMI601.c i2c.c $(SRC_ARCH)/i2c_hw.c
+
+#main.srcs += pt_ant_estimator.c
+
+main.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B9600
+#main.CFLAGS += -DGPS -DUBX -DGPS_LINK=Uart1
+#main.CFLAGS += -DGPS_USER_CALLBACK=pt_ant_estimator_update_self_gps 
-DGPS_USER_CALLBACK_HEADER=\"pt_ant_estimator.h\" 
+#main.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
+#main.srcs += gps_ubx.c gps.c
+
+</makefile>
+</airframe>
+

Deleted: paparazzi3/trunk/conf/airframes/bipbip.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/bipbip.xml  2010-04-27 18:15:57 UTC (rev 
4881)
+++ paparazzi3/trunk/conf/airframes/bipbip.xml  2010-04-27 18:20:49 UTC (rev 
4882)
@@ -1,39 +0,0 @@
-<!--
- This file is part of paparazzi.
-
- paparazzi is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- paparazzi is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with paparazzi; see the file COPYING.  If not, write to
- the Free Software Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. 
--->
-
-<!-- high speed funjet -->
-
-<airframe name="bipbip">
-
-  <makefile>
-ARCHI=avr
-
-BIPBIP_PRIV=bipbip_priv
-
-srv.ARCHDIR=$(ARCHI)
-srv.ARCH = atmega8
-srv.TARGET = srv
-srv.TARGETDIR = srv
-
-srv.srcs = $(BIPBIP_PRIV)/main_srv.c
-#srv.srcs = main_srv.c
-
-  </makefile>
-
-</airframe>

Deleted: paparazzi3/trunk/conf/airframes/bl_mc.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/bl_mc.xml   2010-04-27 18:15:57 UTC (rev 
4881)
+++ paparazzi3/trunk/conf/airframes/bl_mc.xml   2010-04-27 18:20:49 UTC (rev 
4882)
@@ -1,49 +0,0 @@
-<!-- dc motor controller -->
-<airframe name="bl_mc">
-
-  <makefile>
-
-ARCHI=avr
-
-main.ARCHDIR=$(ARCHI)
-main.ARCH = atmega128
-main.TARGET = main
-main.TARGETDIR = main
-
-# internal RC 8MHz
-LOW_FUSE  = e4
-HIGH_FUSE = 99
-EXT_FUSE  = ff
-LOCK_FUSE = ff
-
-# 16MHz ceramic reso with longest startup
-#LOW_FUSE  = cf
-#HIGH_FUSE = 89
-#EXT_FUSE  = ff
-#LOCK_FUSE = ff
-
-main.CFLAGS += -DBOARD_CONFIG=\"conf_bl_mc.h\"
-main.srcs = main_bl_mc.c
-
-main.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1e-2)'
-main.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
-
-main.CFLAGS += -DLED 
-#-DTIME_LED=1
-
-main.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B38400
-main.srcs += $(SRC_ARCH)/uart_hw.c
-
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport 
-DDOWNLINK_DEVICE=Uart1 
-main.srcs += downlink.c pprz_transport.c
-
-main.srcs += $(SRC_ARCH)/bl_mc_power.c
-
-main.srcs += $(SRC_ARCH)/bl_mc_timer.c
-
-main.CFLAGS += -D_32KHZ
-main.srcs += $(SRC_ARCH)/bl_mc_pwm.c
-
-</makefile>
-
-</airframe>
\ No newline at end of file

Deleted: paparazzi3/trunk/conf/airframes/motor_bench.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/motor_bench.xml     2010-04-27 18:15:57 UTC 
(rev 4881)
+++ paparazzi3/trunk/conf/airframes/motor_bench.xml     2010-04-27 18:20:49 UTC 
(rev 4882)
@@ -1,104 +0,0 @@
-<airframe name="MOTOR_BENCH">
-
-  <makefile>
-
-ARCHI=arm7
-
-FLASH_MODE = IAP
-
-MB=motor_bench
-
-main.ARCHDIR = $(ARCHI)
-main.ARCH = arm7tdmi
-main.TARGET = mb
-main.TARGETDIR = mb
-
-main.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
-main.srcs = $(MB)/main_motor_bench.c
-
-main.CFLAGS += -DPERIODIC_TASK_FREQ='250.'
-main.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./PERIODIC_TASK_FREQ)'
-main.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
-
-main.CFLAGS += -DLED
-
-main.srcs += $(SRC_ARCH)/armVIC.c
-
-main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B115200
-main.srcs += $(SRC_ARCH)/uart_hw.c
-
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport 
-DDOWNLINK_DEVICE=Uart0 
-main.srcs += downlink.c pprz_transport.c
-
-main.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
-
-main.srcs += $(MB)/mb_servo.c
-
-main.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=3
-main.CFLAGS += -DUSE_TWI_CONTROLLER
-#main.CFLAGS += -DI2C_SCLL=100 -DI2C_SCLH=100
-#main.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller.c
-main.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_asctech.c
-#main.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_mkk.c
-
-main.CFLAGS += -DMB_TACHO
-main.srcs += $(MB)/mb_tacho.c
-
-main.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1
-main.srcs += $(SRC_ARCH)/adc_hw.c
-main.srcs += $(MB)/mb_current.c
-
-main.CFLAGS += -DMB_SCALE
-main.srcs += $(MB)/mb_scale.c
-
-main.srcs += $(MB)/mb_modes.c
-#main.srcs += $(MB)/mb_static.c
-#main.srcs += $(MB)/mb_mode_fixed_rpm.c
-
-foo.ARCHDIR = $(ARCHI)
-foo.ARCH = arm7tdmi
-foo.TARGET = mb
-foo.TARGETDIR = mb
-
-foo.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
-foo.srcs = $(MB)/main_foo.c
-
-foo.CFLAGS += -DPERIODIC_TASK_FREQ='250.'
-foo.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./PERIODIC_TASK_FREQ)'
-foo.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
-
-foo.CFLAGS += -DLED
-foo.srcs += $(SRC_ARCH)/armVIC.c
-
-foo.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=9
-foo.CFLAGS += -DUSE_TWI_CONTROLLER
-foo.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_asctech.c
-
-
-
-
-bar.ARCHDIR = $(ARCHI)
-bar.ARCH = arm7tdmi
-bar.TARGET = mb
-bar.TARGETDIR = mb
-
-bar.CFLAGS += -DBOARD_CONFIG=\"conf_motor_bench.h\" -I$(MB)
-bar.srcs = $(MB)/main_bar.c
-
-bar.CFLAGS += -DPERIODIC_TASK_FREQ='250.'
-bar.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./PERIODIC_TASK_FREQ)'
-bar.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
-
-bar.CFLAGS += -DLED
-bar.srcs += $(SRC_ARCH)/armVIC.c
-
-bar.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150 -DI2C0_VIC_SLOT=9
-bar.CFLAGS += -DUSE_TWI_CONTROLLER
-bar.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c $(MB)/mb_twi_controller_mkk.c
-
-
-
-
-  </makefile>
-
-</airframe>

Deleted: paparazzi3/trunk/conf/airframes/pt_ant.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/pt_ant.xml  2010-04-27 18:15:57 UTC (rev 
4881)
+++ paparazzi3/trunk/conf/airframes/pt_ant.xml  2010-04-27 18:20:49 UTC (rev 
4882)
@@ -1,63 +0,0 @@
-<airframe name="pt_ant">
-
-<section name="DATALINK" prefix="DATALINK_">
-    <define name="DEVICE_TYPE" value="PPRZ"/>
-    <define name="DEVICE_ADDRESS" value="...."/>
-</section>
-
-
-  <makefile>
-
-tunnel.ARCHDIR = $(ARCHI)
-tunnel.ARCH = arm7tdmi
-tunnel.TARGET = tunnel
-tunnel.TARGETDIR = tunnel
-
-tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"conf_demo.h\" -DLED -DTIME_LED=1
-tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
-
-ARCHI=arm7
-
-FLASH_MODE = IAP
-PT_ANT = antenna
-
-main.ARCHDIR = $(ARCHI)
-main.ARCH = arm7tdmi
-main.TARGET = main
-main.TARGETDIR = main
-
-main.CFLAGS += -DBOARD_CONFIG=\"conf_demo.h\" -I$(PT_ANT)
-main.srcs = $(PT_ANT)/pt_ant_main.c
-
-main.CFLAGS += -DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1.66666667e-2)'
-main.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
-
-main.CFLAGS += -DLED
-
-main.srcs += $(SRC_ARCH)/armVIC.c
-
-main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
-main.srcs += $(SRC_ARCH)/uart_hw.c
-
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport 
-DDOWNLINK_DEVICE=Uart0 
-main.srcs += downlink.c pprz_transport.c $(PT_ANT)/pt_ant_telemetry.c
-
-main.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
-main.srcs += $(PT_ANT)/pt_ant_datalink.c
-
-main.srcs += $(PT_ANT)/pt_ant_motors.c
-
-main.CFLAGS += -DUSE_AMI601 -DI2C_BUF_LEN=32
-main.srcs += AMI601.c i2c.c $(SRC_ARCH)/i2c_hw.c
-
-#main.srcs += pt_ant_estimator.c
-
-main.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B9600
-#main.CFLAGS += -DGPS -DUBX -DGPS_LINK=Uart1
-#main.CFLAGS += -DGPS_USER_CALLBACK=pt_ant_estimator_update_self_gps 
-DGPS_USER_CALLBACK_HEADER=\"pt_ant_estimator.h\" 
-#main.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
-#main.srcs += gps_ubx.c gps.c
-
-</makefile>
-</airframe>
-