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

13 years ago · a24e50b931
6 changed files with 1 additions and 1 deletions
--- a/apps/px4/px4io/driver/Makefile
+++ b/apps/px4/px4io/driver/Makefile
--- a/apps/px4/px4io/driver/px4io.cpp
+++ b/apps/px4/px4io/driver/px4io.cpp
--- a/apps/px4/px4io/driver/uploader.cpp
+++ b/apps/px4/px4io/driver/uploader.cpp
--- a/apps/px4/px4io/driver/uploader.h
+++ b/apps/px4/px4io/driver/uploader.h
--- a/apps/px4/px4io/driver/.context
+++ b/apps/px4/px4io/driver/.context
--- a/nuttx/configs/px4fmu/nsh/appconfig
+++ b/nuttx/configs/px4fmu/nsh/appconfig
@ -93,8 +93,8 @@ CONFIGURED_APPS += drivers/hmc5883
				@@ -93,8 +93,8 @@ CONFIGURED_APPS += drivers/hmc5883
 CONFIGURED_APPS += drivers/mpu6000
 CONFIGURED_APPS += drivers/bma180
 CONFIGURED_APPS += drivers/l3gd20
+CONFIGURED_APPS	+= drivers/px4io
 CONFIGURED_APPS += drivers/stm32/tone_alarm
-CONFIGURED_APPS	+= px4/px4io/driver
 CONFIGURED_APPS += px4/fmu

 # Testing stuff