rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

LP-432 Automatically generate -DHAS_xxx_MODULE for *all* included modules. Use HAS_LOGGING_MODULE inside telemetry.c/setLoggingPeriod() to void function if logging module is not included.

Browse Source
This commit is contained in:
Vladimir Zidar 2017-10-07 15:30:18 +02:00
parent d9cce5e0d9
commit ed1f6881e3
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/make/apps-defs.mk
View File

@ -169,6 +169,10 @@ MODNAMES := $(notdir $(subst /revolution,,$(MODULES)))
MODULES_BUILTIN := $(foreach mod, $(MODNAMES), -DMODULE_$(shell echo $(mod) | tr '[:lower:]' '[:upper:]')_BUILTIN) MODULES_BUILTIN := $(foreach mod, $(MODNAMES), -DMODULE_$(shell echo $(mod) | tr '[:lower:]' '[:upper:]')_BUILTIN)
CDEFS += $(MODULES_BUILTIN) CDEFS += $(MODULES_BUILTIN)
MODNAMES_ALL := $(notdir $(subst /revolution,,$(OPTMODULES) $(MODULES)))
MODULES_ALL := $(foreach mod, $(MODNAMES_ALL), -DHAS_$(shell echo $(mod) | tr '[:lower:]' '[:upper:]')_MODULE)
CDEFS += $(MODULES_ALL)
# List C source files here which must be compiled in ARM-Mode (no -mthumb). # List C source files here which must be compiled in ARM-Mode (no -mthumb).
# Use file-extension c for "c-only"-files # Use file-extension c for "c-only"-files
SRCARM += SRCARM +=

9
flight/modules/Telemetry/telemetry.c
View File

@ -777,6 +777,7 @@ static int32_t setLoggingPeriod(
UAVObjHandle obj, UAVObjHandle obj,
int32_t updatePeriodMs) int32_t updatePeriodMs)
{ {
#ifdef HAS_LOGGING_MODULE
UAVObjEvent ev; UAVObjEvent ev;
int32_t ret; int32_t ret;
@ -798,6 +799,14 @@ static int32_t setLoggingPeriod(
ret = EventPeriodicQueueCreate(&ev, targetQueue, updatePeriodMs); ret = EventPeriodicQueueCreate(&ev, targetQueue, updatePeriodMs);
} }
return ret; return ret;
#else /* HAS_LOGGING_MODULE */
(void)channel;
(void)obj;
(void)updatePeriodMs;
return 0;
#endif /* ifdef HAS_LOGGING_MODULE */
} }
/** /**