Merge branch 'master' of github.com:PX4/Firmware

This commit is contained in:
Lorenz Meier 2014-12-01 11:28:14 +01:00
commit 032ca98e9e
2 changed files with 4 additions and 4 deletions

2
NuttX

@ -1 +1 @@
Subproject commit ec6b670f6d1e964700c0b0a50d14db12761e3097
Subproject commit ae4b05e2c51d07369b5d131052099ac346b0841c

View File

@ -27,14 +27,14 @@ MODULES += drivers/l3gd20
MODULES += drivers/hmc5883
MODULES += drivers/ms5611
MODULES += drivers/mb12xx
#MODULES += drivers/sf0x
# MODULES += drivers/sf0x
MODULES += drivers/ll40ls
#MODULES += drivers/trone
# MODULES += drivers/trone
MODULES += drivers/gps
MODULES += drivers/hil
MODULES += drivers/hott/hott_telemetry
MODULES += drivers/hott/hott_sensors
MODULES += drivers/blinkm
# MODULES += drivers/blinkm
MODULES += drivers/airspeed
MODULES += drivers/ets_airspeed
MODULES += drivers/meas_airspeed