rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity
7,921 Commits 5 Branches 8 Tags 266 MiB
e55519b1e2
Commit Graph

186 Commits

Author SHA1 Message Date
Stacey Sheldon
e55519b1e2 makefile: split tool install rules into separate makefile 
The rules for downloading/building/installing the various
tools were cluttering the top-level makefile.

Conflicts:

	Makefile
 2013-01-28 02:29:08 +02:00
Stacey Sheldon
0fda8035c2 makefile: update to released openocd 0.6.1 2013-01-28 02:13:17 +02:00
Stacey Sheldon
2f93d983b0 makefile: update ARM toolchain to 4.6-2012-q4 2013-01-28 02:11:26 +02:00
Stacey Sheldon
dbcf440bb9 makefile: factor out paths for major flight components 
Conflicts:

	flight/targets/CopterControl/Makefile
 2013-01-28 02:01:39 +02:00
Stacey Sheldon
833b730870 makefile: remove duplicate definitions 2013-01-28 01:56:50 +02:00
Stacey Sheldon
69a2691bc2 rename: move board-specific dirs into flight/targets 
Conflicts:

	flight/targets/Bootloaders/Revolution/Makefile
	flight/targets/CopterControl/Makefile
 2013-01-28 01:52:44 +02:00
Stacey Sheldon
2119067722 Merge remote-tracking branch 'op-revo/james/revo' into revo-next 
Conflicts:
	Makefile
	flight/Modules/Attitude/revolution/attitude.c
	flight/Modules/Battery/battery.c
	flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
	flight/Modules/GPS/GPS.c
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Modules/ManualControl/manualcontrol.c
	flight/Modules/OveroSync/overosync.c
	flight/Modules/PathPlanner/inc/pathplanner.h
	flight/Modules/PathPlanner/pathplanner.c
	flight/Modules/Sensors/sensors.c
	flight/Modules/VtolPathFollower/vtolpathfollower.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/Boards/pios_board.h
	flight/PiOS/STM32F4xx/library.mk
	flight/PiOS/inc/pios_hmc5883.h
	flight/PiOS/inc/pios_l3gd20.h
	flight/PiOS/inc/pios_rfm22b_priv.h
	flight/Revolution/Makefile
	flight/Revolution/Makefile.osx
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	package/Makefile
	shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
	shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/pathdesired.xml
	shared/uavobjectdefinition/vtolpathfollowersettings.xml
	shared/uavobjectdefinition/waypoint.xml
 2012-10-30 00:08:43 -04:00
Stacey Sheldon
4bf2db57ad Merge remote-tracking branch 'op-public/next' into revo-next 2012-10-20 18:34:45 -04:00
Stacey Sheldon
98176d9829 makefile: include hint for enabling verbose build output 2012-10-20 15:06:18 -04:00
Stacey Sheldon
127ca1e7e1 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	ground/openpilotgcs/src/plugins/hitl/plugin.pro
	ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/simulator.h
	ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
 2012-10-20 13:56:18 -04:00
Stacey Sheldon
ebbefd6d54 makefile: quiet down the uavobjgenerator build output 2012-10-20 13:25:24 -04:00
Stacey Sheldon
db571d7a3c makefile: quiet down the GCS build output 
This removes the detailed output of the GCS build by
default so that warnings and errors become more evident.

Full output can be enabled by adding "V=1" to the make
command line.  Same mechanism as is used for the firmware
builds.
 2012-10-20 13:19:16 -04:00
Stacey Sheldon
9e75547bb4 makefile: remove nearly all reliance on symlinks 
Symlinks to nonexistent files or directories don't
work on windows.
 2012-10-13 18:59:15 -04:00
Stacey Sheldon
18b5bd4690 makefile: stop using extended regexp in sed 
Looks like mac doesn't support the -r option to sed to
turn on extended regexps.  It only supports the -E option
which linux doesn't.

So, simplest fix is to avoid extended regexps and just
use as many dots as possible from now on.
 2012-10-13 15:58:20 -04:00
Stacey Sheldon
af1b290381 makefile: stop using -I or -i in xargs 
Windows doesn't like -I.  Mac doesn't like -i.

This now avoids using either option to xargs by
using awk to reorder the ln command line args prior
to invoking xargs.
 2012-10-12 23:57:02 -04:00
Stacey Sheldon
ccdd3de47e makefile: fix androidgcs build issues on windows 
Use '-i' (deprecated) in xargs instead of '-I' so old
versions of xargs work.

Use only relative paths to files passed to tar since the
windows version doesn't seem to handle 'c:/' at the start
of the path.
 2012-10-12 22:49:16 -04:00
James Cotton
11dbdf3a52 AndroidGCS: Only use a 16 character name for UAVOs. Was breaking before on hardware. 2012-10-11 12:38:16 -05:00
PT_Dreamer
8863601715 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate 2012-10-10 18:22:53 +01:00
James Cotton
6e3d9a7c72 Merge branch 'dynamic_uavo_next' into next 2012-10-10 08:31:07 -05:00
James Cotton
3110678321 Merge branch 'dynamic_uavo_next' into revo 
Conflicts:
	androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/RelayTuning.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
 2012-10-10 08:27:11 -05:00
Stacey Sheldon
201ee521d6 makefile: fall-back to android dx in the PATH 2012-10-10 01:10:53 -04:00
Stacey Sheldon
5314d9ad54 makefile: make android builds more quiet 2012-10-10 00:46:20 -04:00
Stacey Sheldon
f7467cbb47 makefile: generate multiple versions of UAVOs 
This will allow a single GCS to have access to multiple
sets of UAVO libraries.
 2012-10-10 00:35:14 -04:00
Stacey Sheldon
4f6bca2a8a makefile: choose correct qt installer for 64-bit machines 2012-10-07 17:29:27 -04:00
Stacey Sheldon
4f53a88c35 makefile: remove debug cruft 2012-10-05 21:00:17 -04:00
Stacey Sheldon
6b4f60b263 makefile: add support for building androidgcs 2012-10-05 20:54:01 -04:00
Stacey Sheldon
bc2080fec7 makefile: add function for computing relative paths 2012-10-05 20:54:00 -04:00
Stacey Sheldon
40251afd6e makefile: add update target for android SDK 
This installs the components required for actually building
a full APK.
 2012-10-05 19:48:08 -04:00
Stacey Sheldon
4305cf942d makefile: Add installer target for the android SDK 2012-10-05 19:48:08 -04:00
Stacey Sheldon
4eb485bdde package: auto-generate Qt resource file for OPFW images 2012-10-05 16:23:42 -04:00
James Cotton
0fa4b062a4 Merge branch 'next' into revo 2012-09-26 00:43:02 -05:00
Stacey Sheldon
ffe88eec5e Merge remote-tracking branch 'op-public/next' into revo-next 2012-09-16 17:14:20 -04:00
Stacey Sheldon
3e236bd3e6 makefile: change QT SDK install dir so we can support multiple installs 
QT SDK version was changed but the install dir wasn't changed
to match.  This makes it impossible to keep both versions
installed at the same time which is essential in order to work
on/build old and new branches.

This update gives the new SDK version a unique install dir so
it can coexist with older versions.
 2012-09-16 16:01:24 -04:00
Stacey Sheldon
754f58c33a Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Revolution/Makefile.osx
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
 2012-09-16 09:56:35 -04:00
James Cotton
51683ffb65 Merge branch 'next' into revo 
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/plugins.pro
 2012-09-15 16:31:30 -05:00
PT_Dreamer
c88c4f0fc0 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 
Conflicts:
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
 2012-09-14 14:12:16 +01:00
James Cotton
42213b21f7 Make OSG selection a QMake config option (OSG) 
To include this module from the command line:
    make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
 2012-09-13 09:46:03 -05:00
Oleg Semyonov
a8487fc990 qt_sdk_install: update QtSDK to 1.2.1 and Qt to 4.8.1 2012-09-12 23:09:06 +03:00
James Cotton
b463e36d67 Add revomini to the build system. 2012-08-25 12:24:13 -05:00
James Cotton
d58831d3f1 GCS: Add conditial flag to include OGS plugins. Must compile with qmake CONFIG+=OSG 
To include this module from the command line:
make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
 2012-08-20 15:36:18 -05:00
James Cotton
4d11406062 Take the makefile from revo-next 2012-08-03 16:23:11 -05:00
Sambas
60c4d7f922 bu targets fix 2012-07-30 11:41:10 +03:00
Stacey Sheldon
54a161a3d4 Merge remote-tracking branch 'op-public/next' into revo-next 
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
 2012-07-08 18:14:09 -04:00
James Cotton
c9bf5f5d06 Merge branch 'next' into revo 2012-07-01 14:44:22 +02:00
Stacey Sheldon
d9dca0b553 Merge branch 'wireshark-plugins' into next 2012-06-30 22:42:38 -04:00
James Cotton
cd311642dd Merge branch 'next' into revo 2012-06-28 10:35:47 +02:00
Stacey Sheldon
22161c56b3 makefile: enable extra context when building multiple targets 
Extra message context is also useful even when building more
than one target in the same invocation of make.

This example would enable extra context:
   make fw_coptercontrol bl_coptercontrol
 2012-06-20 23:38:49 -04:00
Stacey Sheldon
384305d8ee makefile: add additional context to output when building all_* targets 
When building the various all_* targets, it was hard to tell which
board/build-type that each line of output applied to.  Now, the
all_* target types will include something like:
 CC        [fw|cc  ]  flight/PiOS/STM32F10x/pios_gpio.c
which includes the necessary additional context.

This will help with identifying the context for warnings and errors
when building a group of targets.

Conflicts:

	Makefile
 2012-06-20 23:38:21 -04:00
Stacey Sheldon
91a3dec69f makefile: pass short name (CC/PIPX/REVO) into sub-makes 2012-06-20 23:37:37 -04:00
Stacey Sheldon
bbc3877751 makefile: pass build type (BL/FW/BU/EF) into sub-makes 2012-06-20 23:37:29 -04:00