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

Makefile

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

flight/targets/boards/simposix/firmware/Makefile

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

ground/uavobjgenerator/generators/flight/uavobjectgeneratorflight.cpp

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