diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-28 14:54:06 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-28 14:54:06 +0200 |
| commit | 6479ebcc735a96b316bc0624a8b3795bc5677d4e (patch) | |
| tree | ca69a57b87d882a9408df3edbd033b142255adb1 | |
| parent | b1de6c0eaf26b9bb05075ffa18e1eb32d3cae75b (diff) | |
| download | px4-firmware-6479ebcc735a96b316bc0624a8b3795bc5677d4e.tar.gz px4-firmware-6479ebcc735a96b316bc0624a8b3795bc5677d4e.tar.bz2 px4-firmware-6479ebcc735a96b316bc0624a8b3795bc5677d4e.zip | |
General app cleanup for FMU
| -rw-r--r-- | apps/examples/Makefile | 1 | ||||
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 4 | ||||
| -rw-r--r-- | makefiles/setup.mk | 3 | ||||
| -rw-r--r-- | src/drivers/led/module.mk (renamed from src/drivers/led/Makefile) | 6 |
4 files changed, 4 insertions, 10 deletions
diff --git a/apps/examples/Makefile b/apps/examples/Makefile index 201be955b..6b614b1aa 100644 --- a/apps/examples/Makefile +++ b/apps/examples/Makefile @@ -38,7 +38,6 @@ # Sub-directories SUBDIRS = adc can cdcacm nsh -SUBDIRS += math_demo control_demo kalman_demo px4_deamon_app #SUBDIRS = adc buttons can cdcacm composite cxxtest dhcpd discover elf ftpc #SUBDIRS += ftpd hello helloxx hidkbd igmp json keypadtest lcdrw mm modbus mount diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index d196ccaf8..043c8af40 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -115,7 +115,5 @@ endef # command priority stack entrypoint BUILTIN_COMMANDS := \ - $(call _B, math_demo, , 8192, math_demo_main ) \ $(call _B, sercon, , 2048, sercon_main ) \ - $(call _B, serdis, , 2048, serdis_main ) \ - $(call _B, uorb, , 4096, uorb_main ) + $(call _B, serdis, , 2048, serdis_main ) diff --git a/makefiles/setup.mk b/makefiles/setup.mk index 3c910bcfa..8072ec791 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -59,9 +59,6 @@ export INCLUDE_DIRS := $(PX4_MODULE_SRC) \ $(PX4_MODULE_SRC)/modules/ \ $(PX4_INCLUDE_DIR) -# Include from legacy app/library path -export INCLUDE_DIRS += $(NUTTX_APP_SRC) - # # Tools # diff --git a/src/drivers/led/Makefile b/src/drivers/led/module.mk index 7de188259..777f3e442 100644 --- a/src/drivers/led/Makefile +++ b/src/drivers/led/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,7 +32,7 @@ ############################################################################ # -# Makefile to build the LED driver. +# Build the LED driver. # -include $(APPDIR)/mk/app.mk +SRCS = led.cpp |