diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-05-05 11:24:31 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-05-05 11:24:31 +0200 |
| commit | 8c6abe717db1f50c5d4b89f18e27f89608a9a1b8 (patch) | |
| tree | 76a03c70ac51def2bd457e0ddd198328b961cb2c | |
| parent | 2de7a7e587bfe63da23e8440c9a66ba29fc3ec87 (diff) | |
| download | px4-firmware-8c6abe717db1f50c5d4b89f18e27f89608a9a1b8.tar.gz px4-firmware-8c6abe717db1f50c5d4b89f18e27f89608a9a1b8.tar.bz2 px4-firmware-8c6abe717db1f50c5d4b89f18e27f89608a9a1b8.zip | |
Moved BLCTRL driver to new world
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 1 | ||||
| -rw-r--r-- | src/drivers/mkblctrl/mkblctrl.cpp (renamed from apps/drivers/mkblctrl/mkblctrl.cpp) | 0 | ||||
| -rw-r--r-- | src/drivers/mkblctrl/module.mk (renamed from apps/drivers/mkblctrl/Makefile) | 10 |
3 files changed, 5 insertions, 6 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index 043c8af40..07f9bdbc3 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -28,6 +28,7 @@ MODULES += drivers/gps MODULES += drivers/hil MODULES += drivers/hott_telemetry MODULES += drivers/blinkm +MODULES += drivers/mkblctrl MODULES += modules/sensors # diff --git a/apps/drivers/mkblctrl/mkblctrl.cpp b/src/drivers/mkblctrl/mkblctrl.cpp index 3a735e26f..3a735e26f 100644 --- a/apps/drivers/mkblctrl/mkblctrl.cpp +++ b/src/drivers/mkblctrl/mkblctrl.cpp diff --git a/apps/drivers/mkblctrl/Makefile b/src/drivers/mkblctrl/module.mk index b3be2c468..3ac263b00 100644 --- a/apps/drivers/mkblctrl/Makefile +++ b/src/drivers/mkblctrl/module.mk @@ -1,6 +1,6 @@ ############################################################################ # -# Copyright (C) 2012 PX4 Development Team. All rights reserved. +# Copyright (c) 2012,2013 PX4 Development Team. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -35,10 +35,8 @@ # Interface driver for the Mikrokopter BLCtrl # -APPNAME = mkblctrl -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 2048 +MODULE_COMMAND = mkblctrl -INCLUDES = $(TOPDIR)/arch/arm/src/stm32 $(TOPDIR)/arch/arm/src/common +SRCS = mkblctrl.cpp -include $(APPDIR)/mk/app.mk +INCLUDE_DIRS += $(TOPDIR)/arch/arm/src/stm32 $(TOPDIR)/arch/arm/src/common |