1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00

Makefile: fix some MODULE_Name_BUILTIN checks and Makefile

These names are automatically generated by make using the list
of mandatory (always started) modules. Wrong names mean they can
be disabled, fixed now.

Conflicts:
	flight/Modules/Radio/radio.c
This commit is contained in:
Oleg Semyonov 2013-03-16 11:42:12 +02:00
parent 8b4a547d69
commit 7e4596ff35
5 changed files with 5 additions and 5 deletions

View File

@ -89,7 +89,7 @@ int32_t AirspeedStart()
*/ */
int32_t AirspeedInitialize() int32_t AirspeedInitialize()
{ {
#ifdef MODULE_AIRSPEED_BUILTIN #ifdef MODULE_Airspeed_BUILTIN
airspeedEnabled = true; airspeedEnabled = true;
#else #else

View File

@ -82,7 +82,7 @@ static void update_stabilization_settings();
int32_t AutotuneInitialize(void) int32_t AutotuneInitialize(void)
{ {
// Create a queue, connect to manual control command and flightstatus // Create a queue, connect to manual control command and flightstatus
#ifdef MODULE_AUTOTUNE_BUILTIN #ifdef MODULE_Autotune_BUILTIN
autotuneEnabled = true; autotuneEnabled = true;
#else #else
HwSettingsInitialize(); HwSettingsInitialize();

View File

@ -78,7 +78,7 @@ int32_t BatteryInitialize(void)
{ {
#ifdef MODULE_BATTERY_BUILTIN #ifdef MODULE_Battery_BUILTIN
batteryEnabled = true; batteryEnabled = true;
#else #else
uint8_t optionalModules[HWSETTINGS_OPTIONALMODULES_NUMELEM]; uint8_t optionalModules[HWSETTINGS_OPTIONALMODULES_NUMELEM];

View File

@ -75,7 +75,7 @@ struct overosync *overosync;
int32_t OveroSyncInitialize(void) int32_t OveroSyncInitialize(void)
{ {
#ifdef MODULE_OVERO_BUILTIN #ifdef MODULE_OveroSync_BUILTIN
overoEnabled = true; overoEnabled = true;
#else #else

View File

@ -314,7 +314,7 @@ ifeq ($(ENABLE_DEBUG_PINS), YES)
endif endif
# Declare all non-optional modules as built-in to force inclusion # Declare all non-optional modules as built-in to force inclusion
CDEFS += $(foreach mod, $(MODULES), -DMODULE_$(mod)_BUILTIN) CDEFS += $(foreach mod, $(notdir $(MODULES)), -DMODULE_$(mod)_BUILTIN)
# Place project-specific -D and/or -U options for Assembler with preprocessor here. # Place project-specific -D and/or -U options for Assembler with preprocessor here.
#ADEFS = -DUSE_IRQ_ASM_WRAPPER #ADEFS = -DUSE_IRQ_ASM_WRAPPER