diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-23 10:59:01 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-23 10:59:01 +0200 |
| commit | a24e50b9310f84a9e1fb71b37c18d43f997426eb (patch) | |
| tree | b5b6f112e3a7df08c226b432fc04336d345e1713 | |
| parent | f13c7821d9784f2f9bba797f8a17a5e027096cec (diff) | |
| parent | 0afeeb5dd8049ed371aa136482de393cb3bca24c (diff) | |
| download | px4-firmware-a24e50b9310f84a9e1fb71b37c18d43f997426eb.tar.gz px4-firmware-a24e50b9310f84a9e1fb71b37c18d43f997426eb.tar.bz2 px4-firmware-a24e50b9310f84a9e1fb71b37c18d43f997426eb.zip | |
Merge branch 'master' of github.com:PX4/Firmware
| -rw-r--r-- | apps/drivers/px4io/Makefile (renamed from apps/px4/px4io/driver/Makefile) | 0 | ||||
| -rw-r--r-- | apps/drivers/px4io/px4io.cpp (renamed from apps/px4/px4io/driver/px4io.cpp) | 0 | ||||
| -rw-r--r-- | apps/drivers/px4io/uploader.cpp (renamed from apps/px4/px4io/driver/uploader.cpp) | 0 | ||||
| -rw-r--r-- | apps/drivers/px4io/uploader.h (renamed from apps/px4/px4io/driver/uploader.h) | 0 | ||||
| -rw-r--r-- | apps/px4/px4io/driver/.context | 0 | ||||
| -rw-r--r-- | nuttx/configs/px4fmu/nsh/appconfig | 2 |
6 files changed, 1 insertions, 1 deletions
diff --git a/apps/px4/px4io/driver/Makefile b/apps/drivers/px4io/Makefile index cbd942546..cbd942546 100644 --- a/apps/px4/px4io/driver/Makefile +++ b/apps/drivers/px4io/Makefile diff --git a/apps/px4/px4io/driver/px4io.cpp b/apps/drivers/px4io/px4io.cpp index 66db1c360..66db1c360 100644 --- a/apps/px4/px4io/driver/px4io.cpp +++ b/apps/drivers/px4io/px4io.cpp diff --git a/apps/px4/px4io/driver/uploader.cpp b/apps/drivers/px4io/uploader.cpp index 0fbbac839..0fbbac839 100644 --- a/apps/px4/px4io/driver/uploader.cpp +++ b/apps/drivers/px4io/uploader.cpp diff --git a/apps/px4/px4io/driver/uploader.h b/apps/drivers/px4io/uploader.h index 8d41992f8..8d41992f8 100644 --- a/apps/px4/px4io/driver/uploader.h +++ b/apps/drivers/px4io/uploader.h diff --git a/apps/px4/px4io/driver/.context b/apps/px4/px4io/driver/.context deleted file mode 100644 index e69de29bb..000000000 --- a/apps/px4/px4io/driver/.context +++ /dev/null diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig index 629d9877f..a1228bba0 100644 --- a/nuttx/configs/px4fmu/nsh/appconfig +++ b/nuttx/configs/px4fmu/nsh/appconfig @@ -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 |