Commit Graph

237 Commits

Author SHA1 Message Date
Mark Charlebois 7d9a14dab5 Removed duplicate target in Makefile
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2016-02-19 16:59:41 +01:00
Mark Charlebois 8ca3e8e057 Whitespace fixes
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2016-02-19 16:59:41 +01:00
Mark Charlebois 9f3bf8e9f4 Rebase changes on upstream master
This brings in many of the changes from the PX4 fork on ATLFLight.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2016-02-19 16:59:41 +01:00
Lorenz Meier d2041b0ef3 Fix initial build error for new users 2016-02-14 17:37:28 +01:00
Lorenz Meier c5b1e791bd Update git check script. Fixes #3733 2016-02-13 00:50:06 +01:00
Lorenz Meier b4b385cc13 Add Iris optical flow SITL config 2016-02-10 09:24:39 +01:00
Lorenz Meier 9169a585bf Deprecate ROS target 2016-01-24 15:21:17 +01:00
Mohammed Kabir 37ffb61afd changes to rpi2 configs 2016-01-18 22:42:35 +01:00
Mohammed Kabir 4351eb147c Add native RPi2 build config 2016-01-18 22:42:29 +01:00
tumbili 0d1872f223 support building standard vtol plane in SITL gazebo 2016-01-14 16:07:01 +01:00
Lorenz Meier e9dd2aec48 Further git submodule improvements 2016-01-12 10:18:05 +01:00
Lorenz Meier 365ef883e3 Check submodules during each build 2016-01-12 10:14:15 +01:00
Lorenz Meier f99d052582 Fix submodule force. Fixes #3490. 2016-01-11 09:27:48 +01:00
Lorenz Meier ba90ba14b0 NuttX configs: added px4fmu-v2_ekf2 target for EKF2 development on Pixhawk 2016-01-02 17:17:47 +01:00
Lorenz Meier 735c823b57 Remove unmaintained NuttX config 2016-01-02 03:13:49 -08:00
Lorenz Meier 2d72c95eda Add new posix_eagle_default and qurt_eagle_default targets 2016-01-02 09:30:51 +01:00
lchish 6e1f54e2ff Add missing stm32f4discovery make targets 2015-12-29 11:57:29 +01:00
Lorenz Meier ed8645a83b Add EKF2 config and startup option for jMAVSim 2015-12-23 06:23:16 +01:00
Lorenz Meier f0a4979da6 Merged master into driver_framework 2015-12-01 12:34:02 +01:00
David Sidrane a67097731a Renamed pax4fmu-v3 to pax4fmu-v4 2015-11-28 09:13:15 +01:00
David Sidrane f3b7585a89 Wip FMUV3 2015-11-28 09:13:15 +01:00
Lorenz Meier 6b5ba23db8 Makefile: Extend make clean with submodule sync which will save some developers 2015-11-23 12:41:44 +01:00
Lorenz Meier dcb8705059 Adjust to new CMAKE targets 2015-11-22 14:00:01 +01:00
tumbili 2f0b24feab cmake: replace vtol model with tailsitter model 2015-11-18 16:11:10 +01:00
Lorenz Meier a394dd5b0d Add gazebo, gazebo_iris and gazebo_vtol targets 2015-10-29 10:35:35 +01:00
Mark Charlebois 461f72dcee Updated instructions for installing cmake to newer version
The available version of cmake for Ubuntu 12.04 is too old.
The PPA listed does not currently work so the official
cmake webisite is a more reliable source to get cmake.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-10-28 21:58:34 +01:00
Lorenz Meier 8524a50703 Fixed deprecation warning in Makefile 2015-10-27 22:15:19 +01:00
Lorenz Meier a99390503a QuRT travis target: Make accessible via makefile 2015-10-27 09:30:22 +01:00
Lorenz Meier 529d9b4d3a Check and enforce CMake version 2015-10-26 10:19:30 +01:00
Daniel Agar fb3465c117 Makefile fix /bin/shs ninja check 2015-10-25 18:33:39 +01:00
jgoppert 318144ee8b Changed sitl targets to be easier to call from make. 2015-10-25 17:45:30 +01:00
Lorenz Meier aff78e0f5e CMake / Ninja: Use console flag so upload targets can print their normal output and receive input. 2015-10-25 11:22:05 +01:00
jgoppert 0106be3e89 Added local position estimator. 2015-10-24 20:34:33 +02:00
tumbili 06f5e242d1 support launching gazebo automatically for SITL 2015-10-23 09:33:55 +02:00
Mark Charlebois 4b1e4e63f0 eagle: Added posix_eagle_release to Makefile
Enable build of posix_eagle_release.
Added path to ARM cross compiler in qrlsdk install.
Fixed warnings in Toolchain-arm-linux-gnueabihf.cmake

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-10-23 09:06:18 +02:00
Lorenz Meier 9288b8fa70 Add posix_sitl_default target for consistency 2015-10-19 21:48:33 +02:00
Lorenz Meier b61e95adfd Automate SITL run 2015-10-17 17:41:57 +02:00
tumbili c9a3b7b9b0 added config file SITL iris with gazebo 2015-10-17 13:30:44 +02:00
Daniel Agar adc59b9e71 cmake improve submodule handling 2015-10-14 12:13:33 -04:00
Lorenz Meier 51707245bb Makefile: Use blunt force to ensure uavcan submodule is up to date 2015-10-14 12:13:20 +02:00
Daniel Agar 5865dc6434 cmake add libuavcan as subdirectory
-move uavcan submodule to src/modules/uavcan/libuavcan
-adding libuavcan as a subdirectory simplifies inheriting all compile
flags and include paths
2015-10-14 02:37:00 -04:00
Daniel Agar 1bfc919c83 cmake generate MSYS Makefiles on windows 2015-10-14 01:56:16 -04:00
Lorenz Meier 9b45142992 Abort compilation if some smart "developers" think downloading a ZIP file is a good idea. 2015-10-11 12:04:34 +02:00
Daniel Agar 2529f07d44 restore format check 2015-10-06 18:28:30 -04:00
Daniel Agar 74a61a3610 cmake allow Ninja generator 2015-10-06 18:28:30 -04:00
James Goppert 55f963be07 Added ddd support. 2015-10-06 12:18:32 -04:00
Lorenz Meier 90f2e8d61a Force CMake to generate UNIX makefiles on all platforms 2015-10-06 17:03:41 +02:00
James Goppert e1bb618371 Working on uavcan building. 2015-10-04 21:29:22 -04:00
Lorenz Meier d0ca0ff837 Added FMUv1 config 2015-10-03 17:25:49 +02:00
Lorenz Meier 21fadb9ea3 Add distclean target 2015-10-02 11:04:32 +02:00
James Goppert 3c6d101792 Added support for ros-sitl. 2015-09-25 08:29:35 -04:00
James Goppert e38eba0934 cmake: Fix for posix sitl. 2015-09-20 11:17:31 -04:00
Lorenz Meier 6db320741c Makefile: support GDB debugging 2015-09-20 16:40:53 +02:00
Lorenz Meier b9efd8f438 Add lldb make targets 2015-09-20 12:53:56 +02:00
James Goppert 4830c7c9c1 Added io debug target. 2015-09-19 10:39:54 -04:00
James Goppert 676a3d230c Work on px4io firmware building. 2015-09-13 23:20:00 -04:00
James Goppert 5b8905a4e0 Fix for target name. 2015-09-13 15:14:58 -04:00
James Goppert 3203f9ac9e Improvements to make support, added debug target. 2015-09-13 14:39:19 -04:00
Lorenz Meier 05c7a0683d Re-add missing ease-of-use make targets 2015-09-12 15:44:05 +02:00
James Goppert 54f8dd2f4d Support parallel building through -j flag in makefile. 2015-09-12 01:33:36 -04:00
Lorenz Meier 6eb4d015fd Bring back user-friendly Makefile for non-Ubuntu users 2015-09-12 01:39:57 +02:00
Mark Charlebois e4b9212e96 cmake: Updated makefie to show the available build configs
Also fixed param support for nuttx and qurt

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-11 16:15:48 -07:00
James Goppert 298fbf0080 Added more targets to phony. 2015-09-11 13:52:14 -04:00
James Goppert 8bc81d985f Fixed typo in version, exposed some more useful cmake targets. 2015-09-11 00:24:30 -04:00
James Goppert 0e8cc821a9 More config cleanup. 2015-09-11 00:15:33 -04:00
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