[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [5507] change gyro.makefile to gyro_roll.makefile
|
From: |
Felix Ruess |
|
Subject: |
[paparazzi-commits] [5507] change gyro.makefile to gyro_roll.makefile |
|
Date: |
Fri, 20 Aug 2010 13:28:34 +0000 |
Revision: 5507
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5507
Author: flixr
Date: 2010-08-20 13:28:34 +0000 (Fri, 20 Aug 2010)
Log Message:
-----------
change gyro.makefile to gyro_roll.makefile
Modified Paths:
--------------
paparazzi3/trunk/conf/airframes/easystar_example.xml
paparazzi3/trunk/conf/airframes/funjet_example.xml
paparazzi3/trunk/conf/airframes/microjet_example.xml
paparazzi3/trunk/conf/autopilot/tiny.makefile
paparazzi3/trunk/conf/boards/tiny_1.1.makefile
paparazzi3/trunk/conf/boards/tiny_2.11.makefile
Added Paths:
-----------
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gyro_roll.makefile
Removed Paths:
-------------
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gyro.makefile
Modified: paparazzi3/trunk/conf/airframes/easystar_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/easystar_example.xml 2010-08-20
12:36:22 UTC (rev 5506)
+++ paparazzi3/trunk/conf/airframes/easystar_example.xml 2010-08-20
13:28:34 UTC (rev 5507)
@@ -10,15 +10,13 @@
<airframe name="EasyStar TWOGv1">
<firmware name="fixedwing">
- <target name="ap" board="tiny_2.11">
+ <target name="ap" board="twog_1">
<define name="LOITER_TRIM"/>
- <define name="WIND_INFO"/>
<define name="ALT_KALMAN"/>
</target>
<target name="sim" board="pc">
<define name="LOITER_TRIM"/>
- <define name="WIND_INFO"/>
<define name="ALT_KALMAN"/>
</target>
@@ -31,8 +29,8 @@
</firmware>
<firmware name="setup">
- <target name="tunnel" board="tiny_2.11" />
- <target name="setup_actuators" board="tiny_2.11" />
+ <target name="tunnel" board="twog_1" />
+ <target name="setup_actuators" board="twog_1" />
</firmware>
<!-- commands section -->
Modified: paparazzi3/trunk/conf/airframes/funjet_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/funjet_example.xml 2010-08-20 12:36:22 UTC
(rev 5506)
+++ paparazzi3/trunk/conf/airframes/funjet_example.xml 2010-08-20 13:28:34 UTC
(rev 5507)
@@ -10,6 +10,37 @@
<airframe name="Funjet Tiny 2.11">
+ <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="LOITER_TRIM" />
+ <define name="ALT_KALMAN" />
+ </target>
+
+ <subsystem name="radio_control" type="ppm"/>
+ <subsystem name="joystick"/>
+
+ <!-- Communication -->
+ <subsystem name="telemetry" type="xbee_api"/>
+
+ <!-- Actuators -->
+ <subsystem name="actuators" type="4017"/>
+
+ <!-- Sensors -->
+ <subsystem name="attitude" type="infrared"/>
+ <subsystem name="gps" type="ublox_lea4p"/>
+
+ <subsystem name="navigation"/>
+ </firmware>
+
+
+ <firmware name="setup">
+ <target name="tunnel" board="tiny_2.11" />
+ <target name="setup_actuators" board="tiny_2.11" />
+ </firmware>
+
<!-- commands section -->
<servos>
<servo name="MOTOR" no="0" min="1000" neutral="1000" max="2000"/>
@@ -158,53 +189,6 @@
<define name="YAW_RESPONSE_FACTOR" value="0.5"/>
</section>
- <makefile>
-BOARD_CFG = \"tiny_2_1_1.h\"
-FLASH_MODE=IAP
-
-# Board Specifics
-include $(PAPARAZZI_SRC)/conf/autopilot/tiny.makefile
-
-# Fixed Wing Specifics
-include $(PAPARAZZI_SRC)/conf/autopilot/fixedwing_common.makefile
-include $(CFG_FIXEDWING)/fixedwing_autopilot.makefile
-include $(CFG_FIXEDWING)/subsystems/fixedwing_navigation.makefile
-
-# IO Options
-include $(CFG_FIXEDWING)/subsystems/fixedwing_radio_control_ppm.makefile
-include $(CFG_FIXEDWING)/subsystems/fixedwing_actuators_4017.makefile
include $(CFG_FIXEDWING)/subsystems/fixedwing_joystick.makefile
-# Sensors
-include $(CFG_FIXEDWING)/subsystems/fixedwing_attitude_infrared.makefile
-
-### (UART 0, 38400baud) are the default GPS parameters, change and uncomment
if needed
-#GPS_UART_NR = 0
-#GPS_BAUD = 38400
-include $(CFG_FIXEDWING)/subsystems/fixedwing_gps_ublox_lea5h.makefile
-
-### (UART 1, 57600baud) are default modem parameters, change and uncomment if
needed
-#MODEM_UART_NR = 1
-#MODEM_BAUD = 57600
-include $(CFG_FIXEDWING)/subsystems/fixedwing_telemetry_transparent.makefile
-
-
-# Special options
-ap.CFLAGS += -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DWIND_INFO
-
-ap.CFLAGS += -DTRAFFIC_INFO
-ap.srcs += traffic_info.c
-
-
-######################################
-# Config for SITL simulation
-include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
-sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\"
-
-sim.CFLAGS += -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
-
-sim.CFLAGS +=-DTRAFFIC_INFO
-sim.srcs += traffic_info.c
-
- </makefile>
</airframe>
Modified: paparazzi3/trunk/conf/airframes/microjet_example.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/microjet_example.xml 2010-08-20
12:36:22 UTC (rev 5506)
+++ paparazzi3/trunk/conf/airframes/microjet_example.xml 2010-08-20
13:28:34 UTC (rev 5507)
@@ -179,7 +179,7 @@
<subsystem name="actuators" type="4017"/>
<!-- Sensors -->
- <subsystem name="gyro"/>
+ <subsystem name="gyro" type="roll"/>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="navigation"/>
Deleted: paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gyro.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gyro.makefile
2010-08-20 12:36:22 UTC (rev 5506)
+++ paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gyro.makefile
2010-08-20 13:28:34 UTC (rev 5507)
@@ -1,15 +0,0 @@
-# roll stabilization with gyro
-
-#
-# default values for tiny and twog are:
-# ADC_GYRO_ROLL = ADC_3
-# ADC_GYRO_NB_SAMPLES = 16
-#
-# to change just redefine these before including this file
-#
-
-ap.CFLAGS += -DADC_CHANNEL_GYRO_ROLL=$(ADC_GYRO_ROLL) -DUSE_$(ADC_GYRO_ROLL)
-ap.CFLAGS += -DADC_CHANNEL_GYRO_NB_SAMPLES=$(ADC_GYRO_NB_SAMPLES)
-
-ap.CFLAGS += -DGYRO -DADXRS150
-ap.srcs += $(SRC_FIXEDWING)/gyro.c
Copied: paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gyro_roll.makefile
(from rev 5506,
paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gyro.makefile)
===================================================================
--- paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gyro_roll.makefile
(rev 0)
+++ paparazzi3/trunk/conf/autopilot/subsystems/fixedwing/gyro_roll.makefile
2010-08-20 13:28:34 UTC (rev 5507)
@@ -0,0 +1,15 @@
+# roll stabilization with gyro
+
+#
+# default values for tiny and twog are:
+# ADC_GYRO_ROLL = ADC_3
+# ADC_GYRO_NB_SAMPLES = 16
+#
+# to change just redefine these before including this file
+#
+
+ap.CFLAGS += -DADC_CHANNEL_GYRO_ROLL=$(ADC_GYRO_ROLL) -DUSE_$(ADC_GYRO_ROLL)
+ap.CFLAGS += -DADC_CHANNEL_GYRO_NB_SAMPLES=$(ADC_GYRO_NB_SAMPLES)
+
+ap.CFLAGS += -DGYRO -DADXRS150
+ap.srcs += $(SRC_FIXEDWING)/gyro.c
Modified: paparazzi3/trunk/conf/autopilot/tiny.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny.makefile 2010-08-20 12:36:22 UTC
(rev 5506)
+++ paparazzi3/trunk/conf/autopilot/tiny.makefile 2010-08-20 13:28:34 UTC
(rev 5507)
@@ -17,7 +17,7 @@
LPC21ISP_XTAL = 12000
-### default settings for tiny and twog
+### default settings for tiny_2 and twog
GPS_UART_NR = 0
GPS_BAUD = 38400
MODEM_UART_NR = 1
Modified: paparazzi3/trunk/conf/boards/tiny_1.1.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_1.1.makefile 2010-08-20 12:36:22 UTC
(rev 5506)
+++ paparazzi3/trunk/conf/boards/tiny_1.1.makefile 2010-08-20 13:28:34 UTC
(rev 5507)
@@ -9,4 +9,5 @@
BOARD_CFG = \"tiny_1_1.h\"
-
+GPS_UART_NR = 1
+MODEM_UART_NR = 0
Modified: paparazzi3/trunk/conf/boards/tiny_2.11.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_2.11.makefile 2010-08-20 12:36:22 UTC
(rev 5506)
+++ paparazzi3/trunk/conf/boards/tiny_2.11.makefile 2010-08-20 13:28:34 UTC
(rev 5507)
@@ -23,7 +23,7 @@
LPC21ISP_XTAL = 12000
-### default settings for tiny and twog
+### default settings for tiny_2 and twog
GPS_UART_NR = 0
GPS_BAUD = 38400
MODEM_UART_NR = 1
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [5507] change gyro.makefile to gyro_roll.makefile,
Felix Ruess <=