Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 22:17:01 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

always include i2c driver for fixedwing firmware as well, no extra subsystem needed anymore

Browse Source
This commit is contained in:
Felix Ruess
2011-08-23 17:37:27 +02:00
parent 1987d26b88
commit a112535037
28 changed files with 12 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/CDW/ChimuTinyFw.xml
-1
View File
@@ -191,7 +191,6 @@
<subsystem name="navigation"/>
<!-- <subsystem name="gps" type="ublox"/> -->
<!--<subsystem name="i2c"/>-->
</firmware>
conf/airframes/ENAC/fixed-wing/funjet2.xml
-1
View File
@@ -41,7 +41,6 @@
<subsystem name="radio_control" type="ppm"/>
<!--subsystem name="joystick"/-->
<subsystem name="i2c"/>
<!-- Communication -->
<subsystem name="telemetry" type="transparent"/>
conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
-1
View File
@@ -38,7 +38,6 @@
<subsystem name="radio_control" type="ppm"/>
<!--subsystem name="joystick"/-->
<subsystem name="i2c"/>
<subsystem name="spi"/>
<!-- Communication -->
conf/airframes/ENAC/fixed-wing/funjet2_new.xml
-1
View File
@@ -38,7 +38,6 @@
<subsystem name="radio_control" type="ppm"/>
<!--subsystem name="joystick"/-->
<subsystem name="i2c"/>
<subsystem name="spi"/>
<!-- Communication -->
conf/airframes/ENAC/fixed-wing/funjet3.xml
+1 -3
View File
@@ -25,6 +25,7 @@
<firmware name="fixedwing">
<define name="USE_I2C0"/>
<define name="I2C_TRANSACTION_QUEUE_LEN" value="16"/>
<!--define name="AGR_CLIMB"/-->
<define name="ALT_KALMAN"/>
<define name="USE_AIRSPEED"/>
@@ -38,9 +39,6 @@
</target>
<subsystem name="radio_control" type="datalink"/>
<subsystem name="i2c">
<define name="I2C_TRANSACTION_QUEUE_LEN" value="16"/>
</subsystem>
<!-- Communication -->
<subsystem name="telemetry" type="xbee_api"/>
conf/airframes/ENAC/fixed-wing/minimag1.xml
+1 -3
View File
@@ -3,6 +3,7 @@
<airframe name="MiniMag Tiny 2.11">
<firmware name="fixedwing">
<define name="USE_I2C0"/>
<define name="AGR_CLIMB" />
<define name="LOITER_TRIM" />
<define name="ALT_KALMAN" />
@@ -14,9 +15,6 @@
</target>
<subsystem name="spi"/>
<!--subsystem name="i2c">
<define name="USE_I2C0"/>
</subsystem-->
<subsystem name="telemetry" type="transparent">
<configure name="MODEM_BAUD" value="B9600" />
conf/airframes/ENAC/fixed-wing/overview.xml
-1
View File
@@ -28,7 +28,6 @@
<define name="AGR_CLIMB"/>
<define name="USE_I2C0"/>
<subsystem name="i2c"/>
<subsystem name="radio_control" type="ppm"/>
<subsystem name="telemetry" type="xbee_api"/>
<subsystem name="control"/>
conf/airframes/ENAC/fixed-wing/spocIII-1.xml
-1
View File
@@ -24,7 +24,6 @@
<define name="USE_I2C0"/>
</target>
<subsystem name="i2c"/>
<subsystem name="radio_control" type="datalink"/>
conf/airframes/ENAC/fixed-wing/spocIII-2.xml
-1
View File
@@ -31,7 +31,6 @@
<define name="USE_I2C0"/>
</target>
<subsystem name="i2c"/>
<!-- Control -->
<subsystem name="control" type="new"/>
conf/airframes/ENAC/fixed-wing/spocIII-3.xml
-1
View File
@@ -32,7 +32,6 @@
<define name="USE_I2C0"/>
</target>
<subsystem name="i2c"/>
<!-- Control -->
<subsystem name="control" type="new"/>
conf/airframes/ENAC/fixed-wing/twinjet2.xml
-1
View File
@@ -36,7 +36,6 @@
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
<subsystem name="i2c"/>
</firmware>
<firmware name="setup">
conf/airframes/ENAC/fixed-wing/weasel.xml
+2 -4
View File
@@ -13,6 +13,8 @@
</modules>
<firmware name="fixedwing">
<define name="USE_I2C0"/>
<define name="USE_I2C1"/>
<!--define name="AGR_CLIMB"/-->
<define name="ALT_KALMAN"/>
<define name="USE_AIRSPEED"/>
@@ -25,10 +27,6 @@
</target>
<subsystem name="radio_control" type="ppm"/>
<subsystem name="i2c">
<define name="USE_I2C0"/>
<define name="USE_I2C1"/>
</subsystem>
<!-- Communication -->
<subsystem name="telemetry" type="xbee_api"/>
conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
-1
View File
@@ -262,7 +262,6 @@
<subsystem name="navigation"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="i2c"/>
</firmware>
conf/airframes/TU_Delft/MicrojetBRimu.xml
-1
View File
@@ -296,7 +296,6 @@
<!-- Sensors -->
<subsystem name="imu" type="ppzuav"/>
<subsystem name="ahrs" type="float_dcm"/>
<subsystem name="i2c"/>
<subsystem name="gps" type="ublox_utm"/>
<subsystem name="control" />
conf/airframes/TU_Delft/skywalker.xml
-1
View File
@@ -235,7 +235,6 @@
<subsystem name="navigation"/>
<subsystem name="gps" type="xsens"/>
<subsystem name="i2c"/>
</firmware>
conf/airframes/TU_Delft/yapa_xsens.xml
-1
View File
@@ -220,7 +220,6 @@
<subsystem name="navigation"/>
<subsystem name="gps" type="xsens"/>
<subsystem name="i2c"/>
</firmware>
conf/airframes/easystar_ets_example.xml
-1
View File
@@ -27,7 +27,6 @@
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation" type="extra"/>
<subsystem name="i2c"/>
</firmware>
<firmware name="setup">
conf/airframes/flixr_discovery.xml
-2
View File
@@ -38,8 +38,6 @@ http://paparazzi.enac.fr/w/index.php?title=Theory_of_Operation
<subsystem name="navigation" type="extra"/>
<subsystem name="ahrs" type="float_dcm"/>
<subsystem name="i2c"/>
<!-- Sensors -->
<subsystem name="imu" type="booz"/>
<subsystem name="gps" type="ublox"/>
conf/airframes/mm/fixed-wing/funjet43.xml
-1
View File
@@ -24,7 +24,6 @@
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
<!-- Interfaces -->
<subsystem name="i2c"/>
</firmware>
<!-- modules -->
conf/airframes/mm/fixed-wing/funjetdca.xml
-1
View File
@@ -38,7 +38,6 @@
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
<!--subsystem name="i2c"/-->
</firmware>
<firmware name="setup">
conf/airframes/mm/fixed-wing/funjetdcb.xml
-1
View File
@@ -38,7 +38,6 @@
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
<!--subsystem name="i2c"/-->
</firmware>
<firmware name="setup">
conf/airframes/mm/fixed-wing/funjetdcc.xml
-1
View File
@@ -38,7 +38,6 @@
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
<!--subsystem name="i2c"/-->
</firmware>
<firmware name="setup">
conf/airframes/mm/fixed-wing/funjetmm.xml
-1
View File
@@ -41,7 +41,6 @@
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
<subsystem name="i2c"/>
<!--subsystem name="spi"/-->
</firmware>
conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
-1
View File
@@ -39,7 +39,6 @@
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
<subsystem name="i2c"/>
</firmware>
<firmware name="setup">
conf/airframes/mm/fixed-wing/merlin.xml
-1
View File
@@ -186,7 +186,6 @@
<!-- Nav -->
<subsystem name="navigation"/>
<!-- Interfaces -->
<subsystem name="i2c"/>
</firmware>
<firmware name="setup">
conf/airframes/mm/fixed-wing/slowfast2.xml
-1
View File
@@ -27,7 +27,6 @@
<subsystem name="gps" type="ublox"/>
<subsystem name="navigation"/>
<subsystem name="i2c"/>
<subsystem name="gyro" type="roll">
<param name="ADC_GYRO_ROLL" value="ADC_3"/>
</subsystem>
conf/autopilot/subsystems/fixedwing/autopilot.makefile
+7 -8
View File
@@ -76,7 +76,6 @@ $(TARGET).srcs += sys_time.c
#
# InterMCU & Commands
#
$(TARGET).CFLAGS += -DINTER_MCU
$(TARGET).srcs += $(SRC_FIXEDWING)/inter_mcu.c
@@ -85,6 +84,12 @@ $(TARGET).srcs += $(SRC_FIXEDWING)/inter_mcu.c
#
$(TARGET).srcs += math/pprz_geodetic_int.c math/pprz_geodetic_float.c math/pprz_geodetic_double.c math/pprz_trig_int.c
#
# I2C
#
$(TARGET).srcs += mcu_periph/i2c.c
$(TARGET).srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c
######################################################################
##
## COMMON FOR ALL NON-SIMULATION TARGETS
@@ -93,7 +98,6 @@ $(TARGET).srcs += math/pprz_geodetic_int.c math/pprz_geodetic_float.c math/pprz_
#
# Interrupt Vectors
#
ifeq ($(ARCH), lpc21)
ns_srcs += $(SRC_ARCH)/armVIC.c
else ifeq ($(ARCH), stm32)
@@ -110,13 +114,11 @@ endif
#
# Main
#
ns_srcs += $(SRC_FIRMWARE)/main.c
#
# LEDs
#
ns_CFLAGS += -DUSE_LED
ifeq ($(ARCH), stm32)
ns_CFLAGS += -DSYS_TIME_LED=1
@@ -127,7 +129,6 @@ endif
#
# Sys-time
#
ns_CFLAGS += -DUSE_SYS_TIME
ns_srcs += $(SRC_ARCH)/sys_time_hw.c
@@ -135,7 +136,6 @@ ns_srcs += $(SRC_ARCH)/sys_time_hw.c
#
# UARTS
#
ns_srcs += mcu_periph/uart.c
ns_srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
ns_srcs += subsystems/settings.c
@@ -144,8 +144,7 @@ ns_srcs += $(SRC_ARCH)/subsystems/settings_arch.c
#
# ANALOG
#
ns_CFLAGS += -DUSE_ADC
ns_CFLAGS += -DUSE_ADC
#ifeq ($(ARCH), lpc21)
ns_srcs += $(SRC_ARCH)/mcu_periph/adc_arch.c
ifeq ($(ARCH), stm32)
conf/autopilot/subsystems/fixedwing/i2c.makefile
+1 -2
View File
@@ -1,3 +1,2 @@
#generic i2c driver
$(TARGET).srcs += mcu_periph/i2c.c
$(TARGET).srcs += $(SRC_ARCH)/mcu_periph/i2c_arch.c
$(warning The i2c subsystem does not have to be specified explicitly anymore, it is always included now. Please remove the line <subsystem name="i2c"/> from the firmware section of your airframe file!)