Merged master into ros

This commit is contained in:
Lorenz Meier
2015-02-02 21:21:51 +01:00
17 changed files with 276 additions and 416 deletions
+5 -5
View File
@@ -24,18 +24,18 @@ MODULES += drivers/l3gd20
MODULES += drivers/mpu6000
MODULES += drivers/hmc5883
MODULES += drivers/ms5611
#MODULES += drivers/ll40ls
MODULES += drivers/ll40ls
MODULES += drivers/trone
#MODULES += drivers/mb12xx
MODULES += drivers/mb12xx
MODULES += drivers/gps
MODULES += drivers/hil
#MODULES += drivers/blinkm
MODULES += drivers/blinkm
MODULES += drivers/rgbled
MODULES += drivers/mkblctrl
MODULES += drivers/airspeed
#MODULES += drivers/ets_airspeed
MODULES += drivers/ets_airspeed
MODULES += drivers/meas_airspeed
#MODULES += drivers/frsky_telemetry
MODULES += drivers/frsky_telemetry
MODULES += modules/sensors
#
+6 -6
View File
@@ -27,15 +27,15 @@ 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
# MODULES += drivers/hott/hott_telemetry
# MODULES += drivers/hott/hott_sensors
# MODULES += drivers/blinkm
MODULES += drivers/hott
MODULES += drivers/hott/hott_telemetry
MODULES += drivers/hott/hott_sensors
MODULES += drivers/blinkm
MODULES += drivers/airspeed
MODULES += drivers/ets_airspeed
MODULES += drivers/meas_airspeed
+4
View File
@@ -26,6 +26,9 @@ MODULES += drivers/hmc5883
MODULES += drivers/ms5611
MODULES += drivers/pca8574
MODULES += drivers/roboclaw
MODULES += drivers/airspeed
MODULES += drivers/ets_airspeed
MODULES += drivers/meas_airspeed
MODULES += systemcmds/perf
MODULES += systemcmds/reboot
MODULES += systemcmds/tests
@@ -33,6 +36,7 @@ MODULES += systemcmds/nshterm
MODULES += systemcmds/mtd
MODULES += systemcmds/ver
MODULES += systemcmds/top
MODULES += modules/sensors
#
# System commands