1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-04 12:24:11 +01:00
Commit Graph

305 Commits

Author SHA1 Message Date
Alessio Morale
e06ab7f706 Merge remote-tracking branch 'origin/amorale/01-directory_move_sanity_simposix' into next
Conflicts:
	Makefile
	flight/PiOS.posix/inc/pios_com.h
	flight/targets/RevoMini/UAVObjects.inc
	flight/targets/Revolution/Makefile
2013-03-23 14:37:19 +01:00
Stacey Sheldon
990048cf29 ut: fix up unit test clean target name 2013-03-03 14:33:04 +01:00
Oleg Semyonov
8901cde35b ut: remove unused targets 2013-03-03 14:33:04 +01:00
Stacey Sheldon
ea09a53adc unittest: build gtest-all and gtest_main directly
Conflicts:
	make/unittest.mk
2013-03-03 14:33:03 +01:00
Stacey Sheldon
9b94eeb745 ut: convert logfs unit test to gtest
Conflicts:
	Makefile
	make/unittest.mk
2013-03-03 14:33:03 +01:00
Stacey Sheldon
14c5af6148 ut: convert make rules to template and add TAP file generation
Make targets changed to:
 make ut_<test>
 make ut_<test>_tap
 make ut_<test>_run
 make ut_<test>_clean
 make all_ut
 make all_ut_tap
 make all_ut_run
 make all_ut_clean

Conflicts:
	Makefile
2013-03-03 14:33:03 +01:00
Stacey Sheldon
264d76382b makefile: allow arch-specific path to qmake
This will be required once we move to Qt5.
2013-03-03 14:33:03 +01:00
Stacey Sheldon
e00372a540 makefile: define ARCH before including make/tools.mk
ARCH is required in order to pick up the right versions
of the tools for each architecture.
2013-03-03 14:33:03 +01:00
Stacey Sheldon
f934ebfd4c makefile: ensure that the builds are not run as root
When running the build as root, any bugs in the Makefiles
can have disasterous results.  This will be even more
important once we start automatically running unit tests
as part of our build.

This change ensures that the builds cannot be run as root.
2013-03-03 14:33:03 +01:00
Stacey Sheldon
7f53aa422a ut: add basic unit test for logfs
Build it with:
  make ut_logfs

Create a raw flash file like this:
  dd if=/dev/zero bs=1 count=2MiB | tr '\000' '\377' > theflash.bin

Run it with:
  ./build/unit_tests/logfs/logfs.elf && echo 'all good'

Conflicts:
	Makefile
2013-03-03 14:33:02 +01:00
David Willis
70294ed1ad Revert last change that broke compatibility with 12.10.2 2013-02-27 21:18:23 +00:00
David Willis
dec828f9ab Update git version of last UAVObject definition change 2013-02-27 00:12:11 +00:00
Oleg Semyonov
4314faa3f9 Merge remote-tracking branch 'origin/os/android-bamboo-builds' into next 2013-02-04 16:50:58 +02:00
Oleg Semyonov
e09705d604 Makefile: add build-info target (for CI builds) 2013-02-04 15:56:11 +02:00
Oleg Semyonov
c1b0972492 android: make it compatible with RELEASE-12.10.2 2013-02-03 05:11:47 +02:00
Oleg Semyonov
d7efcd28af android: provide debug/release build option 2013-02-03 05:10:38 +02:00
Oleg Semyonov
3daaea3385 android: downgrade Google API version (16 -> 14)
Make it Android 4.0 compatible (was: 4.1.2 and above).
2013-02-03 05:10:37 +02:00
Oleg Semyonov
a0bbd9ec94 android: update SDK version (20.0.3 -> 21.0.1) 2013-02-03 02:10:06 +02:00
Stacey Sheldon
f500ac1e23 rename: move UAVObjects and UAVTalk directories under targets 2013-01-28 02:33:06 +02:00
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
Stacey Sheldon
52a3cff6c6 makefile: remove simposix from all_flight on non-Linux platforms
The simposix build doesn't work on Windows or Mac so it shouldn't
be in the all_flight build target that is used as a pre-submit
check on all platforms.
2012-06-20 23:37:21 -04:00
Stacey Sheldon
78e12e9195 makefile: filter out unbuildable targets for SimPosix 2012-06-20 23:37:03 -04:00
Stacey Sheldon
c75ad12946 makefile: fix dependency for EF images so they work with all_* targets 2012-06-20 23:36:51 -04:00
Theodore A. Roth
a0ad94ad8a ef: fix broken all_ef goal in makefile 2012-06-20 22:23:59 -04:00
Stacey Sheldon
4c47a36bda uavobjgenerator: Add generator for wireshark UAVO plugin
Using 'make uavobjects_wireshark' now generates a complete
wireshark dissector that can decode all fields of the available
UAVObjects.
2012-06-19 00:21:35 -04:00
James Cotton
a029fc4656 Merge branch 'next' into revo
Conflicts:
	Makefile
2012-06-11 12:05:38 -05:00
James Cotton
f9dc3b1f89 Enable simposix on next for linux only. Keeps all_flight building on all
platforms
2012-06-10 14:41:00 -05:00
James Cotton
cac1225607 Remove revolution from main makefile in next as it is currently broken. Also
remove simposix as it triggers error:
FATAL:/usr/bin/../libexec/gcc/darwin/x86_64/as: I don't understand 'a' flag!
2012-06-04 12:27:31 -05:00
James Cotton
b45a4aa35e no simposix for all_flight
Conflicts:

	Makefile
2012-06-04 10:52:26 -05:00
Stacey Sheldon
434d89bd30 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-03 18:25:23 -05:00
Stacey Sheldon
ec0889ea85 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.
2012-06-03 18:25:23 -05:00
Stacey Sheldon
fbb6df8ebf makefile: pass short name (CC/PIPX/REVO) into sub-makes 2012-06-03 18:25:23 -05:00
Stacey Sheldon
34a4f159b2 makefile: pass build type (BL/FW/BU/EF) into sub-makes 2012-06-03 18:25:23 -05:00
Stacey Sheldon
3047b8b815 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-03 17:43:14 -04:00
Stacey Sheldon
e3393bb255 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.
2012-06-03 17:43:14 -04:00
Stacey Sheldon
c5b1522f6a makefile: pass short name (CC/PIPX/REVO) into sub-makes 2012-06-03 17:43:13 -04:00
Stacey Sheldon
1d3694e394 makefile: pass build type (BL/FW/BU/EF) into sub-makes 2012-06-03 17:43:13 -04:00
Corvus Corax
ba50e191af Revert "no simposix for all_flight"
This reverts commit d8753b3815.
2012-06-02 22:23:51 +02:00
Corvus Corax
5b5b41a4c5 Merge remote branch 'origin/stac/use-gnu-arm-toolchain' into revo-next 2012-05-31 16:48:37 +02:00
Sambas
cac9000c16 filter-out osd 2012-05-30 16:41:12 +03:00
Sambas
ed1a4dada6 Merge remote-tracking branch 'remotes/origin/sambas/osd_test_v1' into revo-next
Conflicts:
	flight/PiOS/STM32F4xx/pios_adc.c
2012-05-30 16:30:09 +03:00
James Cotton
58e9c3b3fb Merge branch 'revo-next' of ssh://git.openpilot.org/revo into revo-next 2012-05-28 22:14:18 -05:00
Stacey Sheldon
8ca60ec183 makefile: remove simposix from all_flight on non-Linux platforms
The simposix build doesn't work on Windows or Mac so it shouldn't
be in the all_flight build target that is used as a pre-submit
check on all platforms.
2012-05-28 22:21:46 -04:00
Sambas
d8753b3815 no simposix for all_flight 2012-05-28 19:33:42 +03:00
Sambas
147100bc2f Merge remote-tracking branch 'remotes/origin/revo-next' into osd_test_v1
Conflicts:
	Makefile
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-05-28 19:06:25 +03:00
James Cotton
8a6073fbaf Merge remote-tracking branch 'revo/revo-next' into testing
Conflicts:
	Makefile
	flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
	flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/task.c
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port_posix.c
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
	flight/Revolution/Makefile
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
2012-05-28 09:13:26 -05:00
Stacey Sheldon
bc09c440d6 makefile: fix broken all_ef target due to typo 2012-05-27 21:51:55 -04:00
Stacey Sheldon
dca2d0ee66 makefile: filter out unbuildable targets for SimPosix 2012-05-27 21:51:29 -04:00
Stacey Sheldon
35ed945aff revo bu: BU image doesn't currentyl work on F4 so disable it for revo 2012-05-27 21:39:55 -04:00
Stacey Sheldon
1e33ba62d8 makefile: fix dependency for EF images so they work with all_* targets 2012-05-27 21:39:15 -04:00
Corvus Corax
414310fcba test add of SimPosix architecture - doesnt work yet 2012-05-22 18:28:42 +02:00
Stacey Sheldon
48cb20dc81 hid+vcp: change default USB descriptor to HID+VCP
Now that we have a USB descriptor for HID+VCP that works
on Ubuntu 11.10, MacOS 10.7.3, Win7-SP1-32bit,
WinXP-SP3-32bit, Win7-SP1-64bit.

VCP is known to not work on WinXP without service pack 3.
2012-05-19 16:06:30 -04:00
James Cotton
0f2c41ac5d Merge branch 'revolution' into navigation
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
2012-05-07 21:53:10 -05:00
Stacey Sheldon
cef5a6281f toolchain: switch to gnu arm toolchain for flight software
The GNU toolchain is supported by ARM and provides binary
releases for Linux and Windows.

See: https://launchpad.net/gcc-arm-embedded
2012-05-06 18:33:01 -04:00
James Cotton
3155324384 Merge branch 'next' into cc3d
Conflicts:
	Makefile
	ground/openpilotgcs/src/plugins/config/configahrswidget.cpp
	shared/uavobjectdefinition/ahrscalibration.xml
	shared/uavobjectdefinition/ahrssettings.xml
	shared/uavobjectdefinition/attituderaw.xml
2012-05-03 16:31:49 -05:00
Stacey Sheldon
63285ea451 bu: remove LED support from bootloader updaters
Bootloader updaters were all broken due to recent
changes in LED configuration handling.  Removing
LED support from the BU loads allows them to build
again, but they provide no feedback about when they're
finished writing flash.
2012-04-22 18:42:58 -05:00
Stacey Sheldon
7f03a77492 bu: remove LED support from bootloader updaters
Bootloader updaters were all broken due to recent
changes in LED configuration handling.  Removing
LED support from the BU loads allows them to build
again, but they provide no feedback about when they're
finished writing flash.
2012-04-16 15:09:10 -04:00
James Cotton
7ba32f8735 Check in compilation files for OSX simulation. Update to work on revolution
tree.
2012-04-03 09:16:24 -05:00
Stacey Sheldon
057cfafcf1 qt_sdk: hide install command when not verbose 2012-04-01 19:14:09 -04:00
Stacey Sheldon
a64602de78 qt_sdk: notify user of proper path for installation 2012-04-01 19:13:39 -04:00
Stacey Sheldon
bf84045336 qt_sdk: upgrade to SDK v1.2 (QT v4.8.0)
Qt 4.8+ is now required to build the GCS.

This version of the SDK installer has dropped support
for the --installdir option so users will need to manually
specify the path for installation as:
  <top>/tools/qtsdk-v1.2
in order for the Makefile to pick up this toolchain automatically.

This update drops support for Ubuntu 9.10 (Karmic) due to an
incompatibility with the glibc that ships with that release.

Support should still be possible with Ubuntu 10.04 (Lucid) and
newer.
2012-04-01 19:01:43 -04:00
Stacey Sheldon
f971fc14d5 openocd: update to latest git snapshot (f1c01333) 2012-03-27 00:53:27 -04:00
Stacey Sheldon
871ad80a46 openocd: clone entire git tree before checkout
Using --depth 1 in the git clone resulted in the
desired commit no longer being available in the
resulting clone.
2012-03-27 00:53:27 -04:00
Stacey Sheldon
d299230db8 qt_sdk: upgrade to SDK v1.2 (QT v4.8.0)
Qt 4.8+ is now required to build the GCS.

This version of the SDK installer has dropped support
for the --installdir option so users will need to manually
specify the path for installation as:
  <top>/tools/qtsdk-v1.2
in order for the Makefile to pick up this toolchain automatically.

This update drops support for Ubuntu 9.10 (Karmic) due to an
incompatibility with the glibc that ships with that release.

Support should still be possible with Ubuntu 10.04 (Lucid) and
newer.
2012-03-27 00:18:44 -04:00
Sambas
4c6ee740e2 Merge remote-tracking branch 'remotes/origin/james/revolution' into osd_test_v1 2012-03-25 14:28:25 +03:00
James Cotton
c7ff2a46c7 Merge remote-tracking branch 'origin/laurent/modelview' into revolution
Conflicts:
	flight/CopterControl/Makefile
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
2012-03-22 02:58:24 -05:00
Sambas
742f3ff24d Merge remote-tracking branch 'remotes/origin/james/revolution' into osd_test
Conflicts:
	ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp
2012-03-11 09:39:51 +02:00
Stacey Sheldon
3782cdc58e bu: drop CC and PipX from BU targets since they don't build
The CC and PipX bootloader updater (BU) builds don't currently
work due to some recent changes in how LEDs are handled.

Remove them from the default BU targets so that the all_flight
target can build clean again.

Also fix a linker warning in OP build.
2012-03-10 20:41:15 -05:00
James Cotton
ab8b71a6c1 Bump openocd git revision since the old one doesn't exist anymore (??) 2012-03-03 12:03:47 -06:00
Stacey Sheldon
d53b760937 openocd: Add support for cross-compiling openocd for windows
Linux users can now cross-compile openocd to run on windows.

Here are the steps:
  sudo apt-get install mingw32
  make ftd2xx_install
  make libusb_win_install
  make openocd_git_win_install
  (cd tools; zip -r openocd-win-patched.zip openocd_win/)

This should simplify rolling out new versions of the tool and
provides an example for how to cross-compile future tools as
well.
2012-03-03 08:43:01 -05:00
Stacey Sheldon
c0c38609ec openocd: move to newer openocd (dec6b913)
This update fixes flash writing on F4 chips
2012-03-03 08:43:01 -05:00
Sambas
ebd2ae7e59 Bootloader, copy from revo, not functional 2012-02-18 22:35:13 +02:00
Stacey Sheldon
60a2af2e58 ef+dfu: Move EF image generation into separate makefile
A separate makefile for EF (Entire Flash) targets allows
the removal of board-specific hard-coded addresses.  These
values can now be included from the board-info.mk files
for each board.
2012-02-04 12:03:42 -05:00
Stacey Sheldon
4fafbb13ed makefile: Add EF (Entire Flash) targets for all boards
These new build targets will construct a flash image that
includes both a bootloader as well as a firmware image all
in one.  Examples:
  make ef_coptercontrol
  make ef_revolution

This also adds support for a new target for writing this EF
image to boards that support a DFU interface (only F4-based
boards).  This can be done by running:
  make dfuutil_install
  # Boot board with SBL asserted to activate STM32 DFU ROM
  # Attach USB cable
  make ef_revolution_dfu

Bootloader images are also now padded out to occupy the full
BL flash region.
2012-02-03 00:59:36 -05:00
Stacey Sheldon
99f5f20cb2 openocd: add support for stlink on stm32f4 targets 2012-02-03 00:51:31 -05:00
Stacey Sheldon
3318979714 dfu-util: Add dfu-util install target to Makefile
This tool can be used to read/write the interal device flash
in an STMF4 MCU via the built-in bootloader.

dfu-util can be downloaded and installed using this command:
  make dfuutil_install

The homepage for this tool is at:
  http://dfu-util.gnumonks.org/
2012-01-28 09:28:57 -05:00
James Cotton
7f38d113eb Delete more old target stuff 2012-01-26 11:21:34 -06:00
James Cotton
bb0bfe0ae4 Merge branch 'next' into revolution3
Conflicts:
	flight/Bootloaders/CopterControl/Makefile
	flight/Bootloaders/PipXtreme/Makefile
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/CopterControl/Makefile
	flight/INS/inc/pios_config.h
	flight/Libraries/taskmonitor.c
	flight/Modules/Altitude/altitude.c
	flight/Modules/Attitude/attitude.c
	flight/OpenPilot/Makefile
	flight/OpenPilot/Makefile.posix
	flight/OpenPilot/System/inc/pios_usb_board_data.h
	flight/OpenPilot/System/inc/taskmonitor.h
	flight/OpenPilot/System/pios_board.c
	flight/OpenPilot/System/taskmonitor.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/STM32F4xx/pios_bmp085.c
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/PiOS/pios.h
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/System/inc/taskmonitor.h
	flight/Revolution/System/taskmonitor.c
	ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp
	shared/uavobjectdefinition/systemalarms.xml
	shared/uavobjectdefinition/taskinfo.xml
2012-01-21 11:27:03 -06:00
Stacey Sheldon
0ce95839ca stm32flash: Upgrade to revision 61 to support STM32F4 CPU 2012-01-07 17:28:00 -05:00
James Cotton
d5eb38a065 Remove references to deprecated targets 2012-01-04 19:42:45 -06:00
James Cotton
fffb6449ac Delete the old INS target 2011-11-13 17:31:34 -06:00
James Cotton
9bdd021b2e Make new Revolution target 2011-11-01 01:17:59 -05:00
James Cotton
acf2aa218b Merge remote-tracking branch 'origin/stac/upgrade-to-openocd-0.5.0' into next 2011-09-14 11:49:01 -05:00
James Cotton
ae74706b20 Update URL to ARM SDK 2011-09-11 17:19:31 -05:00
Stacey Sheldon
8198cc881f openocd: upgrade to 0.5.0
Upgrade is needed to support STM32F2 chip on the new boards.

Use 'openocd_install' to download/build the new version
on Linux.
2011-08-27 10:41:53 -04:00
Stacey Sheldon
22110c4c60 build: Switch to GCC 4.5.2 2011-07-20 00:42:51 -04:00
Stacey Sheldon
8c4c73496b build: add unbrick targets
Added new unbrick_<board> targets for each board.
These targets use the stm32flash utility to install
a bootloader on to the board.  This is a tool of
last resort and should not be used for normal firmware
upgrades.

Usage:
  make unbrick_<board> UNBRICK_TTY=/dev/ttyUSB0
Where:
  <board> is one of coptercontrol, pipxtreme,
          openpilot, ins, ahrs
  UNBRICK_TTY is set to the serial device connected
              to the board.
2011-06-15 21:37:10 -04:00
Stacey Sheldon
81dbd3f4c0 build: add install rule for stm32flash utility
This tool can be used as a last resort for
installing a bootloader to a completely bricked
board that is unresponsive to even the rescue
functionality in the GCS uploader gadget.
2011-06-15 21:37:10 -04:00
Stacey Sheldon
6313a78dc9 build: make lists of boards with fw, bl and bu
Provide unique lists of boards for each type of
build (fw, bl, bu) so we can refer to them in
the help text.
2011-06-15 21:37:09 -04:00
Stacey Sheldon
0801495ce1 build: fix spacing on label for clean targets
Whitespace only, no functional changes.
2011-06-15 21:37:09 -04:00
Oleg Semyonov
3dec910954 package: now it is called 'make package' instead of 'make release' 2011-05-28 03:14:51 +03:00
Stacey Sheldon
4da671fc82 build: change firmware files from .opf to .opfw extensions 2011-05-25 00:20:02 -04:00
Stacey Sheldon
076e5660fa build: Add all_<board> and all_<board>_clean targets
Building all_<board> will build all available embedded
images for <board>.  New targets:
  - all_ahrs
  - all_openpilot
  - all_coptercontrol
  - all_pipxtreme
  - all_ins
and their associated _clean targets to remove the build output.
2011-05-24 00:58:10 -04:00
Stacey Sheldon
0a67730d0f build: refactor fw, bl and bu rules
- New macros for fw, bl and bu rules in top-level make
- Per-board info factored into make/board/*/board-info.mk
- Per-board info now shared btw. fw, bl and blupd for each board
   - BOARD_TYPE, BOARD_REVISION, BOOTLOADER_VERSION, HW_TYPE
   - MCU, CHIP, BOARD, MODEL, MODEL_SUFFIX
   - START_OF_BL_CODE, START_OF_FW_CODE
- blupd_* goals renamed to bu_*
- all_blupd goal renamed to all_bu
- firmware goals renamed to fw_*, board name goals are preserved
- bu_*_program now writes updater to correct address for all boards
- BL updater firmware builds now produce .opf format including
  version info blob.
- BL updater firmware name now includes board name.
- INS makefile brought up to date w.r.t. linker scripts
2011-05-23 18:21:42 -04:00
Stacey Sheldon
6ec6425f5e build: build opf images including firmware + version blob 2011-05-22 10:55:13 -04:00
Oleg Semyonov
a0fadf739b OP-483: add 'release' target to the top level Makefile
Now 'make release' on the top level will build release package.

For Windows it will build OpenPilot GCS Installer and all firmware
binaries which are now included into the GCS distribution and will
be installed into the <path>/OpenPilot/share/firmware-<version>
directory.

For other systems it will build all firmware files and the GCS, but
latter is not packaged yet.
2011-05-19 01:57:35 +03:00
Oleg Semyonov
5b1e45a8df OP-483: move Windows installer out of ground/gcs tree
In preparation for release build the Windows installer source is moved
out of ground/gcs source tree into release directory. It is also disabled
in the qmake source file and removed from top level Makefile.
2011-05-18 22:22:40 +03:00
Oleg Semyonov
50f2d0ea76 OP-483: cleanup: replace ';' by '&&' in top Makefile (shouldn't continue on error)
On Windows cd doesn't mean that current directory is as expected since
there is also current drive. So in some rare cases mkdir followed by cd
doesn't change the directory which can result in Makefile overwrites by
qmake, etc. So it is safer to replace ';' by '&&' but need to check if
it still works on Windows under cmd or from Qt-Creator.
2011-05-13 11:25:29 +03:00
Stacey Sheldon
7b52945151 build: clean up typos in help text 2011-05-08 20:03:22 -04:00
Stacey Sheldon
933dcff238 build: note that top-level makefile works on windows 2011-05-08 19:14:50 -04:00
Stacey Sheldon
2301f4bfed build: remove USE_BOOTLOADER var from blupd targets 2011-05-08 14:07:05 -04:00