1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00

Fix the broken revoproto target/sync with revolution

This commit is contained in:
Alessio Morale 2014-04-01 22:24:05 +02:00
parent b58dd938d2
commit e964c863eb
2 changed files with 19 additions and 15 deletions

View File

@ -29,25 +29,26 @@ USE_DSP_LIB ?= NO
# List of mandatory modules to include # List of mandatory modules to include
MODULES += Sensors MODULES += Sensors
MODULES += Attitude/revolution #MODULES += Attitude/revolution
#MODULES += StateEstimation # use instead of Attitude MODULES += StateEstimation # use instead of Attitude
MODULES += Altitude/revolution MODULES += Altitude/revolution
MODULES += Airspeed MODULES += Airspeed
MODULES += AltitudeHold MODULES += AltitudeHold
MODULES += Stabilization MODULES += Stabilization
MODULES += Receiver MODULES += VtolPathFollower
MODULES += ManualControl MODULES += ManualControl
MODULES += Receiver
MODULES += Actuator MODULES += Actuator
MODULES += GPS MODULES += GPS
MODULES += TxPID
MODULES += CameraStab MODULES += CameraStab
MODULES += Battery
MODULES += FirmwareIAP MODULES += FirmwareIAP
MODULES += PathPlanner MODULES += PathPlanner
MODULES += FixedWingPathFollower MODULES += FixedWingPathFollower
#MODULES += OveroSync ## OveroSync disabled until OP292 is fixed MODULES += Osd/osdoutout
MODULES += Logging
MODULES += Telemetry MODULES += Telemetry
#MODULES += VtolPathFollower ## OP-700: VtolPathFollower disabled because its currently unsafe - remove this line once Sambas code has been merged
#MODULES += Battery
#MODULES += TxPID
OPTMODULES += ComUsbBridge OPTMODULES += ComUsbBridge

View File

@ -1,9 +1,5 @@
#####
# Project: OpenPilot
# #
# Makefile for OpenPilot UAVObject code # Copyright (c) 2009-2013, The OpenPilot Team, http://www.openpilot.org
#
# The OpenPilot Team, http://www.openpilot.org, Copyright (C) 2011.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -18,11 +14,10 @@
# You should have received a copy of the GNU General Public License along # You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc., # with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##### #
# These are the UAVObjects supposed to be build as part of the OpenPilot target # These are the UAVObjects supposed to be build as part of the OpenPilot target
# (all architectures) # (all architectures)
UAVOBJSRCFILENAMES = UAVOBJSRCFILENAMES =
UAVOBJSRCFILENAMES += accelgyrosettings UAVOBJSRCFILENAMES += accelgyrosettings
UAVOBJSRCFILENAMES += accessorydesired UAVOBJSRCFILENAMES += accessorydesired
@ -35,12 +30,16 @@ UAVOBJSRCFILENAMES += gyrostate
UAVOBJSRCFILENAMES += gyrosensor UAVOBJSRCFILENAMES += gyrosensor
UAVOBJSRCFILENAMES += accelstate UAVOBJSRCFILENAMES += accelstate
UAVOBJSRCFILENAMES += accelsensor UAVOBJSRCFILENAMES += accelsensor
UAVOBJSRCFILENAMES += magstate
UAVOBJSRCFILENAMES += magsensor UAVOBJSRCFILENAMES += magsensor
UAVOBJSRCFILENAMES += magstate
UAVOBJSRCFILENAMES += barosensor UAVOBJSRCFILENAMES += barosensor
UAVOBJSRCFILENAMES += airspeedsensor UAVOBJSRCFILENAMES += airspeedsensor
UAVOBJSRCFILENAMES += airspeedsettings UAVOBJSRCFILENAMES += airspeedsettings
UAVOBJSRCFILENAMES += airspeedstate UAVOBJSRCFILENAMES += airspeedstate
UAVOBJSRCFILENAMES += debuglogsettings
UAVOBJSRCFILENAMES += debuglogcontrol
UAVOBJSRCFILENAMES += debuglogstatus
UAVOBJSRCFILENAMES += debuglogentry
UAVOBJSRCFILENAMES += flightbatterysettings UAVOBJSRCFILENAMES += flightbatterysettings
UAVOBJSRCFILENAMES += firmwareiapobj UAVOBJSRCFILENAMES += firmwareiapobj
UAVOBJSRCFILENAMES += flightbatterystate UAVOBJSRCFILENAMES += flightbatterystate
@ -67,6 +66,7 @@ UAVOBJSRCFILENAMES += mixersettings
UAVOBJSRCFILENAMES += mixerstatus UAVOBJSRCFILENAMES += mixerstatus
UAVOBJSRCFILENAMES += nedaccel UAVOBJSRCFILENAMES += nedaccel
UAVOBJSRCFILENAMES += objectpersistence UAVOBJSRCFILENAMES += objectpersistence
UAVOBJSRCFILENAMES += oplinkreceiver
UAVOBJSRCFILENAMES += overosyncstats UAVOBJSRCFILENAMES += overosyncstats
UAVOBJSRCFILENAMES += overosyncsettings UAVOBJSRCFILENAMES += overosyncsettings
UAVOBJSRCFILENAMES += pathaction UAVOBJSRCFILENAMES += pathaction
@ -102,6 +102,8 @@ UAVOBJSRCFILENAMES += receiveractivity
UAVOBJSRCFILENAMES += cameradesired UAVOBJSRCFILENAMES += cameradesired
UAVOBJSRCFILENAMES += camerastabsettings UAVOBJSRCFILENAMES += camerastabsettings
UAVOBJSRCFILENAMES += altitudeholdsettings UAVOBJSRCFILENAMES += altitudeholdsettings
UAVOBJSRCFILENAMES += oplinksettings
UAVOBJSRCFILENAMES += oplinkstatus
UAVOBJSRCFILENAMES += altitudefiltersettings UAVOBJSRCFILENAMES += altitudefiltersettings
UAVOBJSRCFILENAMES += altitudeholddesired UAVOBJSRCFILENAMES += altitudeholddesired
UAVOBJSRCFILENAMES += altitudeholdstatus UAVOBJSRCFILENAMES += altitudeholdstatus
@ -110,6 +112,7 @@ UAVOBJSRCFILENAMES += waypointactive
UAVOBJSRCFILENAMES += poilocation UAVOBJSRCFILENAMES += poilocation
UAVOBJSRCFILENAMES += poilearnsettings UAVOBJSRCFILENAMES += poilearnsettings
UAVOBJSRCFILENAMES += mpu6000settings UAVOBJSRCFILENAMES += mpu6000settings
UAVOBJSRCFILENAMES += txpidsettings
UAVOBJSRC = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),$(OPUAVSYNTHDIR)/$(UAVOBJSRCFILE).c ) UAVOBJSRC = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),$(OPUAVSYNTHDIR)/$(UAVOBJSRCFILE).c )
UAVOBJDEFINE = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),-DUAVOBJ_INIT_$(UAVOBJSRCFILE) ) UAVOBJDEFINE = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),-DUAVOBJ_INIT_$(UAVOBJSRCFILE) )