[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [5611] processor
|
From: |
Christophe De Wagter |
|
Subject: |
[paparazzi-commits] [5611] processor |
|
Date: |
Mon, 23 Aug 2010 13:59:40 +0000 |
Revision: 5611
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5611
Author: dewagter
Date: 2010-08-23 13:59:39 +0000 (Mon, 23 Aug 2010)
Log Message:
-----------
processor
Modified Paths:
--------------
paparazzi3/trunk/conf/Makefile.stm32
paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml
paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml
paparazzi3/trunk/conf/airframes/airframe.dtd
paparazzi3/trunk/conf/airframes/microjet_example.xml
paparazzi3/trunk/conf/autopilot/fixedwing.makefile
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_4015.makefile
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/joystick.makefile
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/telemetry_transparent.makefile
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/telemetry_xbee_api.makefile
paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile
paparazzi3/trunk/conf/boards/tiny_2.11.makefile
paparazzi3/trunk/sw/tools/gen_aircraft.ml
paparazzi3/trunk/sw/tools/gen_airframe.ml
Modified: paparazzi3/trunk/conf/Makefile.stm32
===================================================================
--- paparazzi3/trunk/conf/Makefile.stm32 2010-08-23 13:51:15 UTC (rev
5610)
+++ paparazzi3/trunk/conf/Makefile.stm32 2010-08-23 13:59:39 UTC (rev
5611)
@@ -25,9 +25,11 @@
# This is the common Makefile for the stm32-target.
#
+SRC_ARCH = stm32
+
# Pretty Printer
# Call with "make Q=''" to get full command display
-Q=@
+#Q=@
MCU = cortex-m3
#DEBUG = dwarf-2
Modified: paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml
2010-08-23 13:51:15 UTC (rev 5610)
+++ paparazzi3/trunk/conf/airframes/AirborneCodeReorg/LisaFw.xml
2010-08-23 13:59:39 UTC (rev 5611)
@@ -160,7 +160,7 @@
</section>
<firmware name="fixedwing">
- <target name="ap" board="lisa_l_1.0">
+ <target name="ap" board="lisa_l_1.0"
processor="stm32" >
<param name="FLASH_MODE" value="IAP" />
<define name="AGR_CLIMB" />
<define name="ALT_KALMAN" />
@@ -173,7 +173,7 @@
<!-- Communication -->
<subsystem name="telemetry" type="transparent">
<param name="MODEM_UART_NR" value="2"/>
- <param name="MODEM_BAUD" value="9600"/>
+ <param name="MODEM_BAUD" value="B9600"/>
</subsystem>
<!-- Actuators -->
Modified: paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
2010-08-23 13:51:15 UTC (rev 5610)
+++ paparazzi3/trunk/conf/airframes/AirborneCodeReorg/TinyFw.xml
2010-08-23 13:59:39 UTC (rev 5611)
@@ -161,12 +161,12 @@
</section>
<firmware name="fixedwing">
- <target name="sim" board="pc" />
<target name="ap" board="tiny_2.11">
<param name="FLASH_MODE" value="IAP" />
<define name="AGR_CLIMB" />
<define name="ALT_KALMAN" />
</target>
+ <target name="sim" board="pc" />
<subsystem name="radio_control" type="ppm"/>
Modified: paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml 2010-08-23 13:51:15 UTC
(rev 5610)
+++ paparazzi3/trunk/conf/airframes/Poine/booz2_a8.xml 2010-08-23 13:59:39 UTC
(rev 5611)
@@ -190,7 +190,7 @@
<firmware name="lisa_passthrough">
- <target name="stm_passthrough" board="lisa_l_1.0">
+ <target name="stm_passthrough" board="lisa_l_1.0"
processor="stm32" >
</target>
<subsystem name="radio_control" type="spektrum">
<param name="RADIO_CONTROL_SPEKTRUM_MODEL"
@@ -199,7 +199,7 @@
<subsystem name="imu" type="b2_v1.1"/>
- <target name="overo_test_passthrough" board="lisa_l_1.0" >
+ <target name="overo_test_passthrough" board="lisa_l_1.0"
processor="omap" >
<param name="HOST" value="A7"/>
<param name="USER" value=""/>
<param name="TARGET_DIR" value="~"/>
Modified: paparazzi3/trunk/conf/airframes/airframe.dtd
===================================================================
--- paparazzi3/trunk/conf/airframes/airframe.dtd 2010-08-23 13:51:15 UTC
(rev 5610)
+++ paparazzi3/trunk/conf/airframes/airframe.dtd 2010-08-23 13:59:39 UTC
(rev 5611)
@@ -32,7 +32,8 @@
<!ATTLIST target
name CDATA #REQUIRED
-board CDATA #REQUIRED>
+board CDATA #REQUIRED
+processor CDATA #IMPLIED>
<!ATTLIST subsystem
name CDATA #REQUIRED
Modified: paparazzi3/trunk/conf/airframes/microjet_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/microjet_example.xml 2010-08-23
13:51:15 UTC (rev 5610)
+++ paparazzi3/trunk/conf/airframes/microjet_example.xml 2010-08-23
13:59:39 UTC (rev 5611)
@@ -172,7 +172,7 @@
<!-- Communication -->
<subsystem name="telemetry" type="transparent">
- <param name="MODEM_BAUD" value="9600"/>
+ <param name="MODEM_BAUD" value="B9600"/>
</subsystem>
<!-- Actuators -->
Modified: paparazzi3/trunk/conf/autopilot/fixedwing.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/fixedwing.makefile 2010-08-23 13:51:15 UTC
(rev 5610)
+++ paparazzi3/trunk/conf/autopilot/fixedwing.makefile 2010-08-23 13:59:39 UTC
(rev 5611)
@@ -4,6 +4,7 @@
#
+
CFG_FIXEDWING=$(PAPARAZZI_SRC)/conf/autopilot/subsystems/fixedwing
@@ -14,8 +15,9 @@
FIXEDWING_INC = -I$(SRC_FIXEDWING) -I$(SRC_FIXEDWING_ARCH)
-
-
# Standard Fixed Wing Code
include $(CFG_FIXEDWING)/autopilot.makefile
+
+
+
Modified:
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_4015.makefile
===================================================================
---
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_4015.makefile
2010-08-23 13:51:15 UTC (rev 5610)
+++
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/actuators_4015.makefile
2010-08-23 13:59:39 UTC (rev 5611)
@@ -1,5 +1,6 @@
# for Tiny v1.1
-ap.CFLAGS += -DACTUATORS=\"servos_4015_MAT_hw.h\" -DSERVOS_4015_MAT
-ap.srcs += $(SRC_FIXEDWING_ARCH)/servos_4015_MAT_hw.c
$(SRC_FIXEDWING)/actuators.c
+ap.CFLAGS += -DACTUATORS=\"servos_4015_MAT_hw.h\" -DSERVOS_4015_MAT
+ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c
+ap.srcs += $(SRC_FIXEDWING)/actuators.c
Modified:
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
===================================================================
---
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
2010-08-23 13:51:15 UTC (rev 5610)
+++
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
2010-08-23 13:59:39 UTC (rev 5611)
@@ -4,6 +4,6 @@
ap.CFLAGS += -DGPS -DUBX
ap.CFLAGS += -DGPS_LINK=Uart$(GPS_UART_NR)
ap.CFLAGS += -DUSE_UART$(GPS_UART_NR)
-ap.CFLAGS += -DUART$(GPS_UART_NR)_BAUD=B$(GPS_BAUD)
+ap.CFLAGS += -DUART$(GPS_UART_NR)_BAUD=$(GPS_BAUD)
ap.srcs += $(SRC_FIXEDWING)/gps_ubx.c $(SRC_FIXEDWING)/gps.c
$(SRC_FIXEDWING)/latlong.c
Modified:
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
===================================================================
---
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
2010-08-23 13:51:15 UTC (rev 5610)
+++
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
2010-08-23 13:59:39 UTC (rev 5611)
@@ -4,6 +4,6 @@
ap.CFLAGS += -DGPS -DUBX -DGPS_USE_LATLONG
ap.CFLAGS += -DGPS_LINK=Uart$(GPS_UART_NR)
ap.CFLAGS += -DUSE_UART$(GPS_UART_NR)
-ap.CFLAGS += -DUART$(GPS_UART_NR)_BAUD=B$(GPS_BAUD)
+ap.CFLAGS += -DUART$(GPS_UART_NR)_BAUD=$(GPS_BAUD)
ap.srcs += $(SRC_FIXEDWING)/gps_ubx.c $(SRC_FIXEDWING)/gps.c
$(SRC_FIXEDWING)/latlong.c
Modified: paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/joystick.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/joystick.makefile
2010-08-23 13:51:15 UTC (rev 5610)
+++ paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/joystick.makefile
2010-08-23 13:59:39 UTC (rev 5611)
@@ -1,7 +1,5 @@
# joystick for fixedwings
-ap.srcs += joystick.c
-ap.CFLAGS += -DUSE_JOYSTICK
+$(TARGET).srcs += joystick.c
+$(TARGET).CFLAGS += -DUSE_JOYSTICK
-sim.srcs += joystick.c
-sim.CFLAGS += -DUSE_JOYSTICK
Modified:
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile
===================================================================
---
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile
2010-08-23 13:51:15 UTC (rev 5610)
+++
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/radio_control_ppm.makefile
2010-08-23 13:59:39 UTC (rev 5611)
@@ -1,2 +1,4 @@
+
+
ap.CFLAGS += -DRADIO_CONTROL
ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
Modified:
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/telemetry_transparent.makefile
===================================================================
---
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/telemetry_transparent.makefile
2010-08-23 13:51:15 UTC (rev 5610)
+++
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/telemetry_transparent.makefile
2010-08-23 13:59:39 UTC (rev 5611)
@@ -1,7 +1,7 @@
ap.CFLAGS += -DUSE_UART$(MODEM_UART_NR)
-ap.CFLAGS += -DUART$(MODEM_UART_NR)_BAUD=B$(MODEM_BAUD)
+ap.CFLAGS += -DUART$(MODEM_UART_NR)_BAUD=$(MODEM_BAUD)
MODEM_UART = Uart$(MODEM_UART_NR)
Modified:
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/telemetry_xbee_api.makefile
===================================================================
---
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/telemetry_xbee_api.makefile
2010-08-23 13:51:15 UTC (rev 5610)
+++
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/telemetry_xbee_api.makefile
2010-08-23 13:59:39 UTC (rev 5611)
@@ -1,7 +1,7 @@
# XBee modems in API mode
ap.CFLAGS += -DUSE_UART$(MODEM_UART_NR)
-ap.CFLAGS += -DUART$(MODEM_UART_NR)_BAUD=B$(MODEM_BAUD)
+ap.CFLAGS += -DUART$(MODEM_UART_NR)_BAUD=$(MODEM_BAUD)
MODEM_UART = Uart$(MODEM_UART_NR)
Modified: paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile 2010-08-23 13:51:15 UTC
(rev 5610)
+++ paparazzi3/trunk/conf/boards/lisa_l_1.0.makefile 2010-08-23 13:59:39 UTC
(rev 5611)
@@ -4,12 +4,31 @@
# http://paparazzi.enac.fr/wiki/User/LisaL
#
-ARCH=stm32
-ARCHI=stm32
-BOARD=lisa_l
-BOARD_VERSION=1.0
-BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+# -----------------------------------------------------------------------
+ifeq ($(BOARD_PROCESSOR),'omap')
+
+ ARCHI = omap
+ $(TARGET).LDFLAGS += -levent -lm
+
+# -----------------------------------------------------------------------
+else
+
+ ARCH=stm32
+ ARCHI=stm32
+ BOARD=lisa_l
+ BOARD_VERSION=1.0
+ BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+
+ $(TARGET).ARCHDIR = $(ARCHI)
+# not needed?
+# $(TARGET).ARCH = arm7tdmi
+ $(TARGET).TARGET = $(TARGET)
+ $(TARGET).TARGETDIR = $(TARGET)
+
+endif
+# -----------------------------------------------------------------------
+
ifndef FLASH_MODE
FLASH_MODE = JTAG
endif
@@ -33,3 +52,5 @@
GPS_PORT=UART1
GPS_BAUD=B38400
GPS_LED = 3
+
+
Modified: paparazzi3/trunk/conf/boards/tiny_2.11.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_2.11.makefile 2010-08-23 13:51:15 UTC
(rev 5610)
+++ paparazzi3/trunk/conf/boards/tiny_2.11.makefile 2010-08-23 13:59:39 UTC
(rev 5611)
@@ -14,20 +14,15 @@
endif
-$(TARGET).ARCHDIR = $(ARCHI)
-$(TARGET).ARCH = arm7tdmi
-$(TARGET).TARGET = $(TARGET)
-$(TARGET).TARGETDIR = $(TARGET)
-
LPC21ISP_BAUD = 38400
LPC21ISP_XTAL = 12000
### default settings for tiny_2 and twog
GPS_UART_NR = 0
-GPS_BAUD = 38400
+GPS_BAUD = B38400
MODEM_UART_NR = 1
-MODEM_BAUD = 57600
+MODEM_BAUD = B57600
ADC_IR_TOP = ADC_0
ADC_IR1 = ADC_1
@@ -38,3 +33,9 @@
ADC_GYRO_NB_SAMPLES = 16
+# All targets on the TINY board run on the same processor achitecture
+$(TARGET).ARCHDIR = $(ARCHI)
+$(TARGET).ARCH = arm7tdmi
+$(TARGET).TARGET = $(TARGET)
+$(TARGET).TARGETDIR = $(TARGET)
+
Modified: paparazzi3/trunk/sw/tools/gen_aircraft.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_aircraft.ml 2010-08-23 13:51:15 UTC (rev
5610)
+++ paparazzi3/trunk/sw/tools/gen_aircraft.ml 2010-08-23 13:59:39 UTC (rev
5611)
@@ -191,8 +191,19 @@
(Xml.attrib c "value")
end) in
List.iter print_if_subsystem (Xml.children target);
+ let has_processor = ref false in
+ begin try
+ has_processor := not (String.compare (Xml.attrib target
"processor") "" = 0)
+ with _ -> () end;
+ if !has_processor then
+ fprintf makefile_ac "BOARD_PROCESSOR = %s\n"
+ (Xml.attrib target "processor");
fprintf makefile_ac "include
$(PAPARAZZI_SRC)/conf/boards/%s.makefile\n" (Xml.attrib target "board");
- fprintf makefile_ac "include
$(PAPARAZZI_SRC)/conf/autopilot/%s.makefile\n" (Xml.attrib tag "name");
+(** fprintf makefile_ac "%s.ARCHDIR = $(ARCHI)\n%s.ARCH =
$(ARCH)\n%s.TARGET = %s\n%s.TARGETDIR = %s\n"
+ (Xml.attrib target "name") (Xml.attrib target "name")
+ (Xml.attrib target "name") (Xml.attrib target "name")
+ (Xml.attrib target "name") (Xml.attrib target "name");
+**) fprintf makefile_ac "include
$(PAPARAZZI_SRC)/conf/autopilot/%s.makefile\n" (Xml.attrib tag "name");
let print_if_subsystem = (fun d ->
if ExtXml.tag_is d "define" then begin
fprintf makefile_ac "%s.CFLAGS += -D%s\n"
Modified: paparazzi3/trunk/sw/tools/gen_airframe.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_airframe.ml 2010-08-23 13:51:15 UTC (rev
5610)
+++ paparazzi3/trunk/sw/tools/gen_airframe.ml 2010-08-23 13:59:39 UTC (rev
5611)
@@ -217,7 +217,7 @@
printf " commands[COMMAND_%s] = ap_commands[COMMAND_%s];\\\n" com com
| _ -> xml_error "copy"
-
+(**
let parse_subsystem_defines = fun options ->
match Xml.tag options with
"param" ->
@@ -235,8 +235,8 @@
printf "// -%s:\n" (ExtXml.attrib subsystem "name");
List.iter parse_subsystem_defines (Xml.children subsystem)
| _ -> xml_error "subsystem"
+**)
-
let parse_command = fun command no ->
let command_name = "COMMAND_"^ExtXml.attrib command "name" in
define command_name (string_of_int no);
@@ -300,10 +300,6 @@
| "makefile" ->
()
(** Ignoring this section *)
- | "target" ->
- printf "// Subsystems \n";
- List.iter parse_subsystems (Xml.children s);
- printf "// End Subsystems\n\n"
| _ -> ()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [5611] processor,
Christophe De Wagter <=