Commit Graph

322 Commits

Author SHA1 Message Date
James Goppert 07851b79c2 Work on config only for cmake arguments. 2015-09-10 23:43:59 -04:00
James Goppert a2615d793e Put warning on spacing in makefile. 2015-09-10 21:20:49 -04:00
James Goppert 2c33f4921c Add makefile magic to simplify maintenance. 2015-09-10 21:15:55 -04:00
Mark Charlebois a456b6a1c6 Added missing Makefile update
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 16:25:30 -07:00
James Goppert b073edc684 Set makefile default target explicity. 2015-09-10 14:08:03 -04:00
James Goppert 34eeee9fa9 Added defautl config for nuttx, nuttx now works over usb. 2015-09-10 13:57:54 -04:00
James Goppert cadc7280b7 Fixed makefile upload link. 2015-09-10 03:05:17 -04:00
James Goppert 323ae36d9f Added nuttx sim config. 2015-09-09 23:07:30 -04:00
James Goppert bf18c84652 Cleanup of module building. 2015-09-09 23:00:58 -04:00
Mark Charlebois 9c376119d0 cmake: changes required for qurt build
Fixed CMakeLists.txt to be consistent with module.mk
Converted PX4_TICKS_PER_SEC to define for QURT to get around relocation error
Added stubs for QURT so building a full executable can be tested. This will
enable CI testing without the full Hexagon SDK.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-09 13:24:29 -07:00
James Goppert b6b25f2ad1 Nuttx sim support. 2015-09-09 08:18:41 -04:00
Mark Charlebois 7e1c984234 Hack to get posix build partially working
Created a dummy build_git_version.h so I did not have to figure out
how to generate it.

Commented out topic_listener.cpp from src/systemcmds/CMakeLists.txt
because it depends on a generated cpp file.

Link doesn't work mut many modules build

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-08 15:39:13 -07:00
James Goppert 1d6b31d196 Switch to cmake build system. 2015-09-07 20:37:45 -04:00
Daniel Agar 3b0390d432 cleanup 'make check_format and exclude directories not ready for formatting
-uORB, sdlog2, vtol_att_control, ekf_att_pos_estimator
2015-09-05 12:12:52 -04:00
Daniel Agar 5391e8a24f unittests trivial cleanup
-add -Qunused-arguments for clang
-update to a recent cmake
-comment unused variables
2015-08-29 20:43:00 -04:00
Mark Charlebois 3a47434749 Fixes for qurt HIL build
Workaround required Eigen downgrade to 3.2. Hexagon toolchain does
not support C++11 features of newest version of Eigen.

Running make qurt_fixup will downgrade and patch Eigen for qurt.
Running make restore will revert the patch and do a git submodule update
to restore the expected Eigen version.

Added a "restore" target to undo qurt_fixup

Before doing a qurt build run:

    make qurt_fixup

That will downgrade Eigen to 3.2 and apply the require patch.
To build another target after downgrading:

    make restore

Them make the desired target (other than qurt).

Fixed type used in orb_priority to be consistent with the code
(int* was used in declaration but int32_t* used in code)

Removed unused class member variable in sensors.cpp

Added cmake fix for unit tests. The location of px4_log.c changed.

Fixed the qurt drv_hrt.c implementation to use us instead of ms for time resolution

Added px4_led.c to nuttx platform layer
Use the posix version of px4_led.c for nuttx so we don't end up with
duplicate files. It was moved out of common because it is not used by qurt.

Changed PX4_DEBUG to PX4_WARN when checking for the error condition for store_poll_waiter in vdev.cpp

Updated the px4_log.h file to make calls to the qurt_log functions.
The qurt_log function is defined in the platforms/qurt layer.

Added an option to control starting the commander module in HIL mode.

Moved the flight specific drivers to the configuration file instead of adding them
to the common tool chain file because HIL mode does not need them.

Added the uorb Subscriber and Publisher classes

Call PX4_ISFINITE macro instead of isfinite().

Added px4_led.c to nuttx platform layer
Use the posix version of px4_led.c for nuttx so we don't end up with duplicate files.
It was moved out of common because it is not used by qurt.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-08-25 21:59:01 -07:00
devbharat 9a6f52736b Added launchfile to launch gazebo iris and mavros bridge. Added sitl_gazebo to makefile and new init rc file for gazebo iris apps and params 2015-07-23 15:45:59 +02:00
Lorenz Meier 7277d390c4 Merge branch 'beta' 2015-07-12 15:52:02 +02:00
Lorenz Meier cdc17f1fdd Keep temporary topic files to avoid constant re-generation, but delete them on clean 2015-07-12 15:51:43 +02:00
Lorenz Meier 48c356fb2b Fix parallel build for POSIX / QuRT 2015-07-05 12:06:45 +02:00
Lorenz Meier 52687cb8e1 Rename make sitlrun to make sitl_quad 2015-07-04 07:25:08 -07:00
Mark Charlebois 26d2589e97 makefile cleanup
Moved nuttx specific make rules to files in makefiles/nuttx.

All target specific makefiles are in their target sub directories.

To minimize file duplication, targets that share rules include a
common file. For example the posix and posix-arm targets both use
makefiles/posix/posix_elf.mk

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-06-16 09:58:48 -07:00
Mark Charlebois 729653ba71 SITL: changed posix_default to posix_sitl
The SITL build is now the default posix build.

The linker script for posix was moved to makefiles/posix.
The rc.S file was moved to posix-configs/SITL/init/
The POSIXTEST board definition is now SITL

To run the SITL test run:

make sitlrun

This replaces the make posixrun target.

The build directory is now Build/posix_sitl.build/

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-06-15 09:51:07 -07:00
David Sidrane 447b93c090 Add size Makefile target for elf 2015-06-13 06:07:57 -10:00
David Sidrane 428611119f Merged GIT version changes 2015-06-12 19:32:55 +02:00
David Sidrane 17fddb1556 Back Port of Git Versioning - without side effects Part 1 2015-06-12 06:49:15 -10:00
Mark Charlebois 58e263d534 Added posix-arm target and refactored toolchain_* files
The toolchain_* files are target OS specific so they were moved to
the target OS subdir.

The gcc_version.* files are only cleared once per make instantiation so
a build that creates multiple HW targets will try to link with an
incompatible .o file (i.e. x86 build linking ARM .o).  I created
posix-arm as a separate target to fix this problem.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-06-08 22:21:59 -07:00
Mark Charlebois 77cc3cdde1 Remove Build/git_version.* on each make
The Build/git_version.d and Build/git_version.o files need to be
removed on each make to prevent confusion from a previously
generated dependency file for a different target.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-27 19:50:39 -07:00
Mark Charlebois d4749551da git_version.* not removed on clean
The Build/git_version.* files need to be removed on make clean.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-27 19:30:05 -07:00
Lorenz Meier 92f67a923a Make sure the build directory exists 2015-05-27 19:54:46 +02:00
Lorenz Meier 8fd00f4d6d Merged release_v1.0.0 into master 2015-05-23 11:07:10 +02:00
Lorenz Meier ccac324f5b mavlink: Fix GIT string transmission 2015-05-23 11:04:19 +02:00
Lorenz Meier 0d134aac53 systemlib: Use build directory for git version 2015-05-23 10:18:20 +02:00
Lorenz Meier 6d7e063148 Added GIT version which recompiles on each build 2015-05-23 09:59:46 +02:00
Mark Charlebois 2d22e8325d Fix double build when using new make target syntax
When make is invoked as "make posix posix_default"
it will build the posix_default target twice. The Makefile was
fixed to correct this.

If "make posix" is run, the Makefile still calls "make PX4_TARGET_OS=posix".

If "make posix posix_default" is run, the posix target just exports
PX4_TARGET_OS=posix and then make evaluates the next goal (posix_default).

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-21 13:45:53 -07:00
Mark Charlebois 43345e29dc Makefile multi-target support
NuttX is still the default target and all NuttX configs can still
be built with:

make

Individual NuttX, POSIX, and QuRT configs can now be built more
easily by specifying the target and configs:

make posix posix_default
make qurt qurt_hello
make nuttx aerocore_default

Running make with just the target will make all the configs for
that target:

make nuttx
make qurt
make posix

The help is also target specific:
make nuttx help
make qurt help
make posix help

"make help" will still assume you want help for the NuttX target

Added a new QuRT config called qurt_hello as a sample config to
test buiding in different commands for separate configs.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-20 19:19:08 -07:00
Mark Charlebois 9f391b1867 NuttX: fixes for NuttX build
In the upstream tree ringbuffer.h includes the method implementations
in the header file which causes multiple definitions in the link for
other targets. Changed so ringbuffer.cpp is build separately for other
platforms and is included by ringbuffer.h on NuttX.

uORB changes do not link without uORBTest_UnitTest.cpp enabled for
the NuttX build.

px4_getopt was not exported and wasn't visible in NuttX build.

The makefiles were restored to be as close as possible to upstream
so the NuttX build builtin's work again. The code will have to be
refactored after the merge.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-15 12:56:18 -07:00
Mark Charlebois 6a439f7ddc QuRT: Hello world app for QuRT
DSPAL for QuRT is still missing the pthreads exports and there is no
exported sleep function. These functions are stubbed out for the time being.

This is based on the 6.4.05 version of the Hexagon tools.

The Hexagon tools and DSPAL are needed to build the qurt target.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-22 08:48:48 -07:00
Mark Charlebois 19162ba5be Posix: Changed PreflightCheck to read Vdev
PreflightCheck was failing because it was trying to read actual
devices instad of virtual devices.

ADCSIM had a LINUXTEST ifdef that was removed.

posix_run.sh was using the wrong path

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-21 17:14:52 -07:00
Mark Charlebois f3b5076d70 Linux to posix conversion
Changed "linux" target to "posix". Most of the changes are shared with
QuRT and with OSX. The Linux specific parts are in for i2c which uses
<linux/i2c.h> and <linux/i2c-dev.h>.

There is also a check for __PX4_LINUX in mavlink for a tty ioctl that is
not supported.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-21 09:53:09 -07:00
Mark Charlebois 6ce0b7b753 QuRT: added missing make pieces
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-20 11:37:51 -07:00
Mark Charlebois cf71db74d7 Support to specify build time OS target
Now run:

make PX4_TARGET_OS=nuttx

or

make PX4_TARGET_OS=linux

To test the linux build and make sure that the required directories
exist, run:

make linuxrun

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-20 11:16:26 -07:00
Mark Charlebois 2cd44a24ea Linux: Added linker script support for param and added mc_att_control
Added linker script to resolve __param_start and __param_end.

Added mc_att_control to list of supported builtins.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-20 11:16:26 -07:00
Mark Charlebois 51a71d54c6 checksubmodules target needed for Linux build
Moved checksubmodules target back to Makefile.
NuttX download still done for Linux as it would require
too much surgery to remove it.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-20 10:46:44 -07:00
Mark Charlebois 838e9fc769 Refactoring for multiplatform support
Moved the NuttX specific board files to makefiles/nuttx and added
a makfiles/linux directory with sample config and board files.

Created a makefiles/toolchain_native.mk file for building for Linux
with the native system compiler. GCC or clang can be used by setting
a flag in the file.

The Linux build creates an archive file and will build the tasks as
threads. Other code changes are required to support both task based
and thread based builds.

The NuttX source should not be required for the Linux build. The
target OS (NuttX or Linux) is selected by commenting out the desired
line in setup.mk

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-20 10:46:43 -07:00
Daniel Agar b1dcb10f25 add make check_format to check astyle code formatting 2015-03-02 12:48:19 -05:00
Lorenz Meier 100fb07142 Fix ordering of check submodule execution 2015-03-01 18:06:00 +01:00
Lorenz Meier 2b71bff858 Generate messages first, then check submodules 2015-03-01 11:38:53 +01:00
Andrew Tridgell 91aab00fa0 build: avoid wiping an existing PYTHONPATH variable 2015-02-16 22:54:32 +01:00
Lorenz Meier eeb192730f Revert "include default PYTHONPATH in call to uorb header generation script"
This reverts commit 7e6198b3dd.
2015-02-12 13:29:08 +01:00
Thomas Gubler 7e6198b3dd include default PYTHONPATH in call to uorb header generation script 2015-02-05 19:44:30 +01:00
Lorenz Meier 37ec1ec8de Improve submodule checking 2015-02-03 20:27:51 +01:00
Thomas Gubler 2728889f78 Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge_attctlposctl 2015-01-28 16:29:14 +01:00
James Goppert a3b2c99801 A huge developer time saver, J="" make archives
This gives warnings about -j1 being forced some places, but
it still successfully builds all archvies in parallel. The
resulting archives have been tested on the board. It is
disabled by default so no functional change unless someone
adds J="" or J=8 in front of the make archvies.
2015-01-28 10:20:20 +01:00
Thomas Gubler d7e57061c9 generate message wrapper headers on ros 2015-01-23 11:58:24 +01:00
Thomas Gubler 738f65a705 generate wrapper headers for uorb 2015-01-23 10:34:04 +01:00
Thomas Gubler 143ff444e4 fix merge error of tests target change 2015-01-07 17:28:56 +01:00
Thomas Gubler 154111d4c0 move checksubmodules and generateuorbtopicheaders dependency 2015-01-07 17:01:03 +01:00
Thomas Gubler fe279d340d Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	Makefile
2015-01-07 16:00:59 +01:00
Thomas Gubler 213f08ee07 generate uorb topic headers for tests make target 2015-01-06 23:52:04 +01:00
Thomas Gubler ee561947e9 makefile: fix order 2015-01-06 19:14:57 +01:00
Daniel Agar bd130ec397 move sf0x_test to cmake and remove unittests/Makefile 2015-01-05 18:55:38 -05:00
Thomas Gubler f4e0dc2857 Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	.gitmodules
2014-12-29 08:00:12 +01:00
Lorenz Meier d04f1fde50 Suppress nothing to do messages from make for clean targets 2014-12-26 17:37:36 +01:00
Thomas Gubler 25af4b266c Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
	.gitignore
	src/lib/uavcan
2014-12-25 09:48:15 +01:00
Lorenz Meier 032b25c81b Creating Firmware ZIP file and ignoring it in GIT 2014-12-21 12:09:16 +01:00
Lorenz Meier a4606dc270 Add make tests to Makefile 2014-12-20 18:50:51 +01:00
Thomas Gubler 9520983e08 lots' of header juggling and small changes to make mc att control compile for NuttX and ROS 2014-12-16 08:24:51 +01:00
Thomas Gubler 6f9cbd9751 add genmsg and gencpp python modules, ros not required anymore for message generation 2014-12-04 16:40:46 +01:00
Thomas Gubler 8e8f84bde0 uorb topic header generator: only create new files if the file content really changed 2014-12-04 10:39:24 +01:00
Thomas Gubler 8b5bc703a1 initial version of msg to uorb script
Standard and embedded types work, may need small refinements for some
types
2014-12-01 16:39:27 +01:00
Lorenz Meier 086fc7f758 Merge pull request #1128 from PX4/uavcan
Basic UAVCAN support
2014-07-22 06:48:49 +02:00
Pavel Kirienko 6814ddccff UAVCAN as a submodule 2014-07-08 20:19:17 +04:00
Andrew Tridgell ee92334512 build: fixed running build from external directory 2014-07-08 15:34:47 +02:00
Lorenz Meier 2eb018b273 bugfixes for checks and tools 2014-07-07 22:20:55 +02:00
Lorenz Meier cd9f4f33a5 Turn instructions into a makefile command, allowing Windows GUI kids to create a make target in Eclipse just for this 2014-07-07 17:51:30 +02:00
Lorenz Meier 72ccbe9c4e Fixed check tools 2014-07-07 17:35:47 +02:00
Lorenz Meier 4c2cc65ca6 Cleaning up sub modules 2014-07-07 17:18:54 +02:00
tstellanova 23a355644b grab the git hash and inject it into every log file header 2013-09-06 10:18:08 -07:00
px4dev 07f7fd1585 Fix the firmware build rules so that we always know how to build all the firmwares and thus we can have dependencies between FMU and IO firmware handled a little more sensibly. 2013-08-25 22:26:47 -07:00
px4dev 54711bbcfe In order to save people from themselves, force a given FMU version to depend on the corresponding _default IO version. This avoids the risk of building a new FMU ROMFS with an old IO firmware, at the cost of the sanity of anyone reading this. 2013-08-23 00:23:32 -07:00
px4dev f70a4b3b70 Add support for adding extra files to the ROMFS from the config.
If there is an IO firmware image already built when we build the corresponding FMU ROMFS, copy it into the ROMFS. Note - due to there being no fixed build ordering, to be certain that you have the most current IO firmware, you must build the IO firmware explicitly first.
2013-08-22 23:47:55 -07:00
px4dev 33863165b2 Merge commit 'de749a3602423f5ee6ca56f3cf2dfff04e31ec6d' (kconfig-cleanup) into fmuv2_bringup 2013-08-14 21:23:00 -07:00
px4dev b6676f6cb8 NuttX is confused when it doesn't know what board it's building for - since we don't tell it in the config anymore, we need to pass it a hint. 2013-08-12 23:54:35 -07:00
px4dev c4498ce9a3 Add a 'menuconfig' target that makes it possible to use the NuttX menuconfig tool on the PX4 config files. 2013-08-12 21:56:20 -07:00
px4dev f36a2ff45a Add a 'menuconfig' target that makes it possible to use the NuttX menuconfig tool on the PX4 config files. 2013-08-11 14:00:09 -07:00
px4dev f8951759f8 Add a top-level Makefile rule for building "everything" as a test. 2013-08-04 19:50:23 -07:00
px4dev 64e856276e Merge branch 'fmuv2_bringup' of https://github.com/cvg/Firmware_Private into fmuv2_bringup 2013-08-04 15:01:11 -07:00
px4dev c14a71c095 Move NuttX configurations out of the NuttX tree proper. This reduces the diffs we have to carry against the NuttX upstream repo to just our local patches to the NuttX code itself. 2013-08-03 10:06:10 -07:00
px4dev ecc7bc5bca Clean out unused trash from the NuttX configs. 2013-08-02 23:11:04 -07:00
px4dev 9d6ec6b365 Restructure things so that the PX4 configs move out of the NuttX tree, and most of the PX4-specific board configuration data moves out of the config and into the board driver.
Rename some directories that got left behind in the great board renaming.
2013-08-02 22:34:55 -07:00
Julian Oes a19e0f2f9c Small fix for make distclean, Linux find doesn't seem to know the -depth n argument 2013-07-18 09:45:27 +02:00
px4dev b4029dd824 Pull v2 pieces up to build with the merge 2013-07-07 17:53:55 -07:00
px4dev d178276438 All NuttX configs are called 'nsh' now, stop trying to guess based on the board name. 2013-06-12 23:58:22 -07:00
px4dev 504b6d1256 Hotfix: install the firmware .bin files as well as the .px4 bundles until we have a chance to fix the px4io uploader. 2013-05-17 01:55:02 -07:00
px4dev edb0e01dfd HOTFIX: simplify symbol names going into the ROMFS object, hopefully this avoids inconsistent symbol naming on Windows. 2013-05-12 14:04:57 -07:00
Lorenz Meier 13110e0a1f ROMFS wide quad mixer addition and cleanup 2013-05-05 11:35:56 +02:00
px4dev 01e427b17c Merge working changes into export-build branch. 2013-04-26 16:14:32 -07:00
px4dev 335a645330 Add some help text. 2013-03-31 15:46:07 -07:00
Thomas Gubler e0376fc375 archlinux compatibility 2013-03-09 15:22:24 +01:00
px4dev b6218794c6 Stick copyrights on the major moving parts of the build system 2013-02-23 22:01:00 -08:00
px4dev d24599931a APP -> MODULE
remove as many duplicate slashes, etc. as seems practical
2013-02-23 22:01:00 -08:00
px4dev 8d7621079a Checkpoint: application framework makefile done 2013-02-23 22:00:59 -08:00
px4dev 50739c1843 platform -> board 2013-02-23 22:00:59 -08:00
px4dev abe48bd714 Auto-generate builtin command prototypes.
Tidy up path configuration, etc.
2013-02-23 22:00:59 -08:00
px4dev a7a1cc4625 Add support for per-config ROMFS generation. 2013-02-23 22:00:59 -08:00
px4dev 963621c1f3 Rename makefiles to help categorise them. 2013-02-23 22:00:59 -08:00
px4dev 8440e4f709 Simplify the PLATFORM/CONFIG handling a little. 2013-02-23 22:00:59 -08:00
px4dev e9f2197bfa Move upload functionality out into a separate makefile. 2013-02-23 22:00:59 -08:00
px4dev e692ccc44e Move more functionality into firmware.mk. Now we build the px4 bundles in a way that will let external builders generate them too.
Pass the platform define into the firmware builder.
2013-02-23 22:00:59 -08:00
px4dev d2d9800c2e Recover commits lost in the previous merge. Syllableise PX4_BASE like its peers. 2013-02-23 22:00:58 -08:00
px4dev 919d53766a Less noisy build again. 2013-01-11 02:31:30 -08:00
px4dev f127495caa Manually fixup merge botches via direct comparison with NuttX r5447. 2013-01-11 02:14:43 -08:00
px4dev e7723e0d52 Force a configure before compiling in order to work around more NuttX/config dependency issues. 2013-01-02 22:13:30 -08:00
px4dev 3f42006696 Don't re-run the configuration phase every time we build; NuttX will re-build just about everything if you do. 2013-01-01 20:35:43 -08:00
Lorenz Meier d16d66f990 Enabled UART3, added JTAG make target for IO, removed potentially problematic usleep 2012-11-30 10:42:27 +01:00
Julian Oes c2a2eb1a1a Raised COM port number for windows from 18 to 32 2012-11-27 10:45:11 -08:00
Lorenz Meier 1b3ab2f18d Pull JTAG config from bootloader dir 2012-10-24 08:34:58 +02:00
tnaegeli c9f27cbdc9 f 2012-09-24 18:23:00 +02:00
px4dev 99515fc1dd 'make clean' at the top level should 'distclean' in NuttX, as it's not obvious otherwise how to get NuttX to clean out its dependencies and app configuration. 2012-08-18 20:37:53 -07:00
Lorenz Meier 4eef4e1864 Ensured startup of USB link, updated port ids to read from 2012-08-10 16:18:45 +02:00
px4dev 8a365179ea Fresh import of the PX4 firmware sources. 2012-08-04 15:12:36 -07:00