rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

OP-899: move UAVObjects and UAVTalk one level up from targets

Browse Source
This commit is contained in:
Oleg Semyonov 2013-04-17 00:44:06 +03:00 committed by Oleg Semyonov
parent 3f2431c04f
commit 27195b7327
16 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -190,8 +190,8 @@ uavobjects_clean:
export PIOS := $(ROOT_DIR)/flight/PiOS export PIOS := $(ROOT_DIR)/flight/PiOS
export FLIGHTLIB := $(ROOT_DIR)/flight/Libraries export FLIGHTLIB := $(ROOT_DIR)/flight/Libraries
export OPMODULEDIR := $(ROOT_DIR)/flight/Modules export OPMODULEDIR := $(ROOT_DIR)/flight/Modules
export OPUAVOBJ := $(ROOT_DIR)/flight/targets/UAVObjects export OPUAVOBJ := $(ROOT_DIR)/flight/uavobjects
export OPUAVTALK := $(ROOT_DIR)/flight/targets/UAVTalk export OPUAVTALK := $(ROOT_DIR)/flight/uavtalk
export DOXYGENDIR := $(ROOT_DIR)/flight/Doc/Doxygen export DOXYGENDIR := $(ROOT_DIR)/flight/Doc/Doxygen
export OPUAVSYNTHDIR := $(BUILD_DIR)/uavobject-synthetics/flight export OPUAVSYNTHDIR := $(BUILD_DIR)/uavobject-synthetics/flight
export OPGCSSYNTHDIR := $(BUILD_DIR)/openpilotgcs-synthetics export OPGCSSYNTHDIR := $(BUILD_DIR)/openpilotgcs-synthetics

8
flight/targets/boards/simposix/firmware/Makefile
View File

@ -42,10 +42,11 @@ MODULES += FirmwareIAP
# Paths # Paths
OPSYSTEM = . OPSYSTEM = .
BOARDINC = ..
OPSYSTEMINC = $(OPSYSTEM)/inc OPSYSTEMINC = $(OPSYSTEM)/inc
OPUAVTALK = ../../../UAVTalk OPUAVTALK = ../../../../uavtalk
OPUAVTALKINC = $(OPUAVTALK)/inc OPUAVTALKINC = $(OPUAVTALK)/inc
OPUAVOBJ = ../../../UAVObjects OPUAVOBJ = ../../../../uavobjects
OPUAVOBJINC = $(OPUAVOBJ)/inc OPUAVOBJINC = $(OPUAVOBJ)/inc
PIOSINC = $(PIOS)/inc PIOSINC = $(PIOS)/inc
OPMODULEDIR = ../../../../Modules OPMODULEDIR = ../../../../Modules
@ -55,7 +56,6 @@ MATHLIB = $(FLIGHTLIB)/math
MATHLIBINC = $(FLIGHTLIB)/math MATHLIBINC = $(FLIGHTLIB)/math
PIOSPOSIX = $(PIOS)/posix PIOSPOSIX = $(PIOS)/posix
PIOSCOMMON = $(PIOS)/posix PIOSCOMMON = $(PIOS)/posix
PIOSBOARDS = $(PIOS)/Boards
PIOSCOMMONLIB = $(PIOS)/Common/Libraries PIOSCOMMONLIB = $(PIOS)/Common/Libraries
BOOT = BOOT =
BOOTINC = BOOTINC =
@ -102,6 +102,7 @@ SRC += $(UAVOBJSRC)
# Each directory must be seperated by a space. # Each directory must be seperated by a space.
EXTRAINCDIRS += $(PIOS) EXTRAINCDIRS += $(PIOS)
EXTRAINCDIRS += $(PIOSINC) EXTRAINCDIRS += $(PIOSINC)
EXTRAINCDIRS += $(BOARDINC)
EXTRAINCDIRS += $(OPSYSTEMINC) EXTRAINCDIRS += $(OPSYSTEMINC)
EXTRAINCDIRS += $(OPUAVTALK) EXTRAINCDIRS += $(OPUAVTALK)
EXTRAINCDIRS += $(OPUAVTALKINC) EXTRAINCDIRS += $(OPUAVTALKINC)
@ -111,7 +112,6 @@ EXTRAINCDIRS += $(UAVOBJSYNTHDIR)
EXTRAINCDIRS += $(FLIGHTLIBINC) EXTRAINCDIRS += $(FLIGHTLIBINC)
EXTRAINCDIRS += $(MATHLIBINC) EXTRAINCDIRS += $(MATHLIBINC)
EXTRAINCDIRS += $(PIOSCOMMON) EXTRAINCDIRS += $(PIOSCOMMON)
EXTRAINCDIRS += $(PIOSBOARDS)
EXTRAINCDIRS += $(CMSISDIR) EXTRAINCDIRS += $(CMSISDIR)
EXTRAINCDIRS += $(OPUAVSYNTHDIR) EXTRAINCDIRS += $(OPUAVSYNTHDIR)
EXTRAINCDIRS += $(BOOTINC) EXTRAINCDIRS += $(BOOTINC)

0
flight/targets/UAVObjects/Makefiletemplate.inc → flight/uavobjects/Makefiletemplate.inc
View File

0
flight/targets/UAVObjects/eventdispatcher.c → flight/uavobjects/eventdispatcher.c
View File

0
flight/targets/UAVObjects/inc/eventdispatcher.h → flight/uavobjects/inc/eventdispatcher.h
View File

0
flight/targets/UAVObjects/inc/uavobjectmanager.h → flight/uavobjects/inc/uavobjectmanager.h
View File

0
flight/targets/UAVObjects/inc/uavobjectsinittemplate.h → flight/uavobjects/inc/uavobjectsinittemplate.h
View File

0
flight/targets/UAVObjects/inc/uavobjecttemplate.h → flight/uavobjects/inc/uavobjecttemplate.h
View File

0
flight/targets/UAVObjects/inc/utlist.h → flight/uavobjects/inc/utlist.h
View File

0
flight/targets/UAVObjects/uavobjectmanager.c → flight/uavobjects/uavobjectmanager.c
View File

0
flight/targets/UAVObjects/uavobjectsinittemplate.c → flight/uavobjects/uavobjectsinittemplate.c
View File

0
flight/targets/UAVObjects/uavobjecttemplate.c → flight/uavobjects/uavobjecttemplate.c
View File

0
flight/targets/UAVTalk/inc/uavtalk.h → flight/uavtalk/inc/uavtalk.h
View File

0
flight/targets/UAVTalk/inc/uavtalk_priv.h → flight/uavtalk/inc/uavtalk_priv.h
View File

0
flight/targets/UAVTalk/uavtalk.c → flight/uavtalk/uavtalk.c
View File

2
ground/uavobjgenerator/generators/flight/uavobjectgeneratorflight.cpp
View File

@ -35,7 +35,7 @@ bool UAVObjectGeneratorFlight::generate(UAVObjectParser* parser,QString template
QString flightObjInit,objInc,objFileNames,objNames; QString flightObjInit,objInc,objFileNames,objNames;
qint32 sizeCalc; qint32 sizeCalc;
flightCodePath = QDir( templatepath + QString("flight/targets/UAVObjects")); flightCodePath = QDir( templatepath + QString("flight/uavobjects"));
flightOutputPath = QDir( outputpath + QString("flight") ); flightOutputPath = QDir( outputpath + QString("flight") );
flightOutputPath.mkpath(flightOutputPath.absolutePath()); flightOutputPath.mkpath(flightOutputPath.absolutePath());