Merged

2026-10-15 12:13:34 +08:00 · 2013-04-22 13:13:08 +02:00
parent 7e0f8b3eda b7e947cb3d
commit 17e01eb9cb
17 changed files with 997 additions and 54 deletions
@@ -308,6 +308,10 @@
 #define GPIO_SPI1_MOSI	GPIO_SPI1_MOSI_1
 #define GPIO_SPI1_SCK	GPIO_SPI1_SCK_1

+#define GPIO_SPI2_MISO	GPIO_SPI2_MISO_2
+#define GPIO_SPI2_MOSI	GPIO_SPI2_MOSI_2
+#define GPIO_SPI2_SCK	GPIO_SPI2_SCK_2
+
 #define GPIO_SPI3_MISO	GPIO_SPI3_MISO_2
 #define GPIO_SPI3_MOSI	GPIO_SPI3_MOSI_1
 #define GPIO_SPI3_SCK	GPIO_SPI3_SCK_2
@@ -321,6 +325,8 @@
 #define PX4_SPIDEV_ACCEL	2
 #define PX4_SPIDEV_MPU		3

+#define PX4_SPIDEV_ACCEL_MAG 2 // external for anti vibration test
+
 /*
 * Tone alarm output
 */
@@ -109,16 +109,15 @@ endif
 CONFIGURED_APPS += systemcmds/i2c

 # Communication and Drivers
-CONFIGURED_APPS += drivers/boards/px4fmu
+#CONFIGURED_APPS += drivers/boards/px4fmu
 CONFIGURED_APPS	+= drivers/device
 CONFIGURED_APPS += drivers/ms5611
 CONFIGURED_APPS += drivers/hmc5883
 CONFIGURED_APPS += drivers/mpu6000
 CONFIGURED_APPS += drivers/bma180
-CONFIGURED_APPS += drivers/l3gd20
 CONFIGURED_APPS	+= drivers/px4io
 CONFIGURED_APPS += drivers/stm32
-CONFIGURED_APPS += drivers/led
+#CONFIGURED_APPS += drivers/led
 CONFIGURED_APPS += drivers/blinkm
 CONFIGURED_APPS += drivers/stm32/tone_alarm
 CONFIGURED_APPS += drivers/stm32/adc
@@ -85,7 +85,7 @@ CONFIG_ARCH_FPU=y
 CONFIG_ARCH_INTERRUPTSTACK=n
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH_BOOTLOADER=n
-CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_LEDS=n
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n
 CONFIG_ARCH_DMA=y
@@ -111,8 +111,6 @@ CONFIGURED_APPS += drivers/boards/px4fmuv2
 CONFIGURED_APPS	+= drivers/device
 # XXX needs conversion to SPI
 #CONFIGURED_APPS += drivers/ms5611
-CONFIGURED_APPS += drivers/l3gd20
-CONFIGURED_APPS += drivers/lsm303d
 # XXX needs conversion to serial
 #CONFIGURED_APPS	+= drivers/px4io
 CONFIGURED_APPS += drivers/stm32