From aa85fba9796a7eda6874a2719e0bab7cfa2897ff Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Fri, 26 Apr 2013 11:01:47 +0200 Subject: [PATCH] Ported AR.Drone interface to new style config --- makefiles/config_px4fmu_default.mk | 2 +- .../drivers}/ardrone_interface/ardrone_interface.c | 0 .../ardrone_interface/ardrone_motor_control.c | 0 .../ardrone_interface/ardrone_motor_control.h | 0 .../drivers/ardrone_interface/module.mk | 12 +++++------- 5 files changed, 6 insertions(+), 8 deletions(-) rename {apps => src/drivers}/ardrone_interface/ardrone_interface.c (100%) rename {apps => src/drivers}/ardrone_interface/ardrone_motor_control.c (100%) rename {apps => src/drivers}/ardrone_interface/ardrone_motor_control.h (100%) rename apps/ardrone_interface/Makefile => src/drivers/ardrone_interface/module.mk (88%) diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index c7109f213c..1302d15821 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -14,6 +14,7 @@ MODULES += drivers/px4fmu MODULES += drivers/boards/px4fmu MODULES += drivers/lsm303d MODULES += drivers/l3gd20 +MODULES += drivers/ardrone_interface MODULES += systemcmds/eeprom # @@ -36,7 +37,6 @@ endef # command priority stack entrypoint BUILTIN_COMMANDS := \ $(call _B, adc, , 2048, adc_main ) \ - $(call _B, ardrone_interface, SCHED_PRIORITY_MAX-15, 2048, ardrone_interface_main ) \ $(call _B, bl_update, , 4096, bl_update_main ) \ $(call _B, blinkm, , 2048, blinkm_main ) \ $(call _B, bma180, , 2048, bma180_main ) \ diff --git a/apps/ardrone_interface/ardrone_interface.c b/src/drivers/ardrone_interface/ardrone_interface.c similarity index 100% rename from apps/ardrone_interface/ardrone_interface.c rename to src/drivers/ardrone_interface/ardrone_interface.c diff --git a/apps/ardrone_interface/ardrone_motor_control.c b/src/drivers/ardrone_interface/ardrone_motor_control.c similarity index 100% rename from apps/ardrone_interface/ardrone_motor_control.c rename to src/drivers/ardrone_interface/ardrone_motor_control.c diff --git a/apps/ardrone_interface/ardrone_motor_control.h b/src/drivers/ardrone_interface/ardrone_motor_control.h similarity index 100% rename from apps/ardrone_interface/ardrone_motor_control.h rename to src/drivers/ardrone_interface/ardrone_motor_control.h diff --git a/apps/ardrone_interface/Makefile b/src/drivers/ardrone_interface/module.mk similarity index 88% rename from apps/ardrone_interface/Makefile rename to src/drivers/ardrone_interface/module.mk index fea96082f6..058bd1397d 100644 --- a/apps/ardrone_interface/Makefile +++ b/src/drivers/ardrone_interface/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 @@ -32,11 +32,9 @@ ############################################################################ # -# Makefile to build ardrone interface +# AR.Drone motor driver # -APPNAME = ardrone_interface -PRIORITY = SCHED_PRIORITY_MAX - 15 -STACKSIZE = 2048 - -include $(APPDIR)/mk/app.mk +MODULE_COMMAND = ardrone_interface +SRCS = ardrone_interface.c \ + ardrone_motor_control.c