From 8c6abe717db1f50c5d4b89f18e27f89608a9a1b8 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sun, 5 May 2013 11:24:31 +0200 Subject: [PATCH] Moved BLCTRL driver to new world --- makefiles/config_px4fmu_default.mk | 1 + {apps => src}/drivers/mkblctrl/mkblctrl.cpp | 0 .../Makefile => src/drivers/mkblctrl/module.mk | 10 ++++------ 3 files changed, 5 insertions(+), 6 deletions(-) rename {apps => src}/drivers/mkblctrl/mkblctrl.cpp (100%) rename apps/drivers/mkblctrl/Makefile => src/drivers/mkblctrl/module.mk (87%) diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index 043c8af40a..07f9bdbc32 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 similarity index 100% rename from apps/drivers/mkblctrl/mkblctrl.cpp rename to src/drivers/mkblctrl/mkblctrl.cpp diff --git a/apps/drivers/mkblctrl/Makefile b/src/drivers/mkblctrl/module.mk similarity index 87% rename from apps/drivers/mkblctrl/Makefile rename to src/drivers/mkblctrl/module.mk index b3be2c4687..3ac263b002 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