forked from Archive/PX4-Autopilot
Moved last libs, drivers and headers, cleaned up IO build
This commit is contained in:
Lorenz Meier
parent
f57439b90e
commit
13fc670386
|
|
@ -10,6 +10,7 @@ ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_common
|
|||
#
|
||||
# Board support modules
|
||||
#
|
||||
MODULES += drivers/device
|
||||
MODULES += drivers/stm32
|
||||
MODULES += drivers/stm32/adc
|
||||
MODULES += drivers/stm32/tone_alarm
|
||||
|
|
@ -74,6 +75,21 @@ MODULES += modules/multirotor_pos_control
|
|||
#
|
||||
MODULES += modules/sdlog
|
||||
|
||||
#
|
||||
# Libraries
|
||||
#
|
||||
MODULES += modules/systemlib
|
||||
MODULES += modules/systemlib/mixer
|
||||
MODULES += modules/mathlib
|
||||
MODULES += modules/mathlib/CMSIS
|
||||
MODULES += modules/controllib
|
||||
MODULES += modules/uORB
|
||||
|
||||
#
|
||||
# Demo apps
|
||||
#
|
||||
MODULES += examples/math_demo
|
||||
|
||||
#
|
||||
# Transitional support - add commands from the NuttX export archive.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ define SRC_SEARCH
|
|||
$(abspath $(firstword $(wildcard $(MODULE_SRC)/$1) MISSING_$1))
|
||||
endef
|
||||
|
||||
ABS_SRCS := $(foreach src,$(SRCS),$(call SRC_SEARCH,$(src)))
|
||||
ABS_SRCS ?= $(foreach src,$(SRCS),$(call SRC_SEARCH,$(src)))
|
||||
MISSING_SRCS := $(subst MISSING_,,$(filter MISSING_%,$(ABS_SRCS)))
|
||||
ifneq ($(MISSING_SRCS),)
|
||||
$(error $(MODULE_MK): missing in SRCS: $(MISSING_SRCS))
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ export ARCHIVE_DIR = $(abspath $(PX4_BASE)/Archives)/
|
|||
# Default include paths
|
||||
#
|
||||
export INCLUDE_DIRS := $(PX4_MODULE_SRC) \
|
||||
$(PX4_MODULE_SRC)/modules/ \
|
||||
$(PX4_INCLUDE_DIR)
|
||||
|
||||
# Include from legacy app/library path
|
||||
|
|
|
|||
|
|
@ -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,4 +35,8 @@
|
|||
# Build the device driver framework.
|
||||
#
|
||||
|
||||
include $(APPDIR)/mk/app.mk
|
||||
SRCS = cdev.cpp \
|
||||
device.cpp \
|
||||
i2c.cpp \
|
||||
pio.cpp \
|
||||
spi.cpp
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
#include <stdint.h>
|
||||
|
||||
/* XXX for ORB_DECLARE used in many drivers */
|
||||
#include "../uORB/uORB.h"
|
||||
#include "../modules/uORB/uORB.h"
|
||||
|
||||
/*
|
||||
* ioctl() definitions
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/****************************************************************************
|
||||
*
|
||||
* Copyright (C) 2012 PX4 Development Team. All rights reserved.
|
||||
* Author: @author Example User <mail@example.com>
|
||||
* Copyright (c) 2012, 2013 PX4 Development Team. All rights reserved.
|
||||
* Author: James Goppert
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
|
|
@ -34,6 +34,7 @@
|
|||
|
||||
/**
|
||||
* @file math_demo.cpp
|
||||
* @author James Goppert
|
||||
* Demonstration of math library
|
||||
*/
|
||||
|
||||
|
|
@ -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,10 @@
|
|||
############################################################################
|
||||
|
||||
#
|
||||
# Makefile to build uORB
|
||||
# Mathlib / operations demo application
|
||||
#
|
||||
|
||||
APPNAME = uorb
|
||||
PRIORITY = SCHED_PRIORITY_DEFAULT
|
||||
STACKSIZE = 4096
|
||||
MODULE_COMMAND = math_demo
|
||||
MODULE_STACKSIZE = 12000
|
||||
|
||||
include $(APPDIR)/mk/app.mk
|
||||
SRCS = math_demo.cpp
|
||||
|
|
@ -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
|
||||
|
|
@ -34,13 +34,10 @@
|
|||
#
|
||||
# Control library
|
||||
#
|
||||
CSRCS = test_params.c
|
||||
|
||||
CXXSRCS = block/Block.cpp \
|
||||
SRCS = test_params.c \
|
||||
block/Block.cpp \
|
||||
block/BlockParam.cpp \
|
||||
block/UOrbPublication.cpp \
|
||||
block/UOrbSubscription.cpp \
|
||||
blocks.cpp \
|
||||
fixedwing.cpp
|
||||
|
||||
include $(APPDIR)/mk/app.mk
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue