diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-27 13:16:24 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-27 13:16:24 +0200 |
| commit | c89f46f59055f4cc0d7ada4a26e48f021278538e (patch) | |
| tree | fad5468553562db5c41bdcd0ff407e42fde31c78 | |
| parent | e6ed8268ee610d0b9e9b4930ad379a6d7dcc3629 (diff) | |
| download | px4-firmware-c89f46f59055f4cc0d7ada4a26e48f021278538e.tar.gz px4-firmware-c89f46f59055f4cc0d7ada4a26e48f021278538e.tar.bz2 px4-firmware-c89f46f59055f4cc0d7ada4a26e48f021278538e.zip | |
Moved sensors app to new world
| -rw-r--r-- | makefiles/config_px4fmu_default.mk | 3 | ||||
| -rw-r--r-- | src/modules/sensors/.context (renamed from apps/sensors/.context) | 0 | ||||
| -rw-r--r-- | src/modules/sensors/module.mk (renamed from apps/sensors/Makefile) | 13 | ||||
| -rw-r--r-- | src/modules/sensors/sensor_params.c (renamed from apps/sensors/sensor_params.c) | 0 | ||||
| -rw-r--r-- | src/modules/sensors/sensors.cpp (renamed from apps/sensors/sensors.cpp) | 0 |
5 files changed, 6 insertions, 10 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index 80c34d5dd..aae7e9b0e 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -15,8 +15,7 @@ MODULES += drivers/boards/px4fmu MODULES += drivers/l3gd20 MODULES += drivers/ardrone_interface MODULES += drivers/px4io -# sensors app is WIP -#MODULES += modules/sensors +MODULES += modules/sensors # # System commands diff --git a/apps/sensors/.context b/src/modules/sensors/.context index e69de29bb..e69de29bb 100644 --- a/apps/sensors/.context +++ b/src/modules/sensors/.context diff --git a/apps/sensors/Makefile b/src/modules/sensors/module.mk index 526fb0164..ebbc580e1 100644 --- a/apps/sensors/Makefile +++ b/src/modules/sensors/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,11 +35,8 @@ # Makefile to build the sensor data collector # -APPNAME = sensors -PRIORITY = SCHED_PRIORITY_MAX-5 -STACKSIZE = 4096 +MODULE_COMMAND = sensors +MODULE_PRIORITY = "SCHED_PRIORITY_MAX-5" -CXXSRCS = sensors.cpp -CSRCS = sensor_params.c - -include $(APPDIR)/mk/app.mk +SRCS = sensors.cpp \ + sensor_params.c diff --git a/apps/sensors/sensor_params.c b/src/modules/sensors/sensor_params.c index c850e3a1e..c850e3a1e 100644 --- a/apps/sensors/sensor_params.c +++ b/src/modules/sensors/sensor_params.c diff --git a/apps/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index 123bbb120..123bbb120 100644 --- a/apps/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp |