Commit Graph

14489 Commits

Author SHA1 Message Date
Lorenz Meier b222a83076 Merge branch 'master' of github.com:PX4/Firmware into cmake-2 2015-10-02 11:00:31 +02:00
Matthias Grob 5191731f22 make romfs pruner script windows compatible
When we open the file handle to write back the lines in binary mode, we don't change the line endings but instead leave them as they were before. This is impotant for Windows users as Python on Windows otherwise adds CRLF endings to the parameter files and they can't be correctly parsed by NuttX any more.
2015-10-01 09:59:30 +02:00
Lorenz Meier 6987c1367e Merge pull request #2925 from mcharleb/cmake-2-qurt-eigen
qurt: Must use latest version of Eigen
2015-10-01 09:51:36 +02:00
Lorenz Meier 8937499f26 Merge pull request #2931 from UAVenture/fw_disarmed
Make sure the generic fixed wing types AERT/AETR can arm the ESC.
2015-09-30 11:34:40 +02:00
Simon Wilks e7529839c7 Make sure the default fixed wing types (AERT/AETR) can arm the ESC. 2015-09-30 10:55:24 +02:00
Mark Charlebois c5e66e41f1 qurt: Must use latest version of Eigen
The latest version of Eigen is required to build with the Hexagon
7.4 toolchain. Only certain C++11 features are supported and the
latest version if Eigen provides these tests. A patch is required
to add support for the Hexagon compiler.

These changes force the sync and then update of eigen and allow it
to be patched for qurt.

The eigen-3.2 submodule was removed as it is no longer needed by the
qurt build with the updated toolchain.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-28 10:49:48 -07:00
Lorenz Meier 837d122dda Merge pull request #2923 from UAVenture/cmake-2
Remove var for relative include directories
2015-09-28 17:00:02 +02:00
Andreas Antener 2d381d57b0 remove var for relative include directories 2015-09-28 11:21:42 +02:00
Lorenz Meier aa40f1fd97 Commander: More detailed status 2015-09-27 18:57:51 +02:00
Lorenz Meier 96e0ac4581 Merge branch 'sensor_load' into cmake-2 2015-09-27 18:10:18 +02:00
Lorenz Meier afb68cb0ab MAVLink: Switch to HOME_POSITION message 2015-09-27 18:06:53 +02:00
Lorenz Meier ec0f53f7c1 Merge branch 'master' into cmake-2 2015-09-27 17:42:04 +02:00
Lorenz Meier 5c52efece4 Sensors app: Rate limit new sensor discovery 2015-09-27 17:33:37 +02:00
Lorenz Meier 866e07c326 MAVLink app: Configure USB link correctly 2015-09-27 17:21:31 +02:00
Lorenz Meier a4e56abd71 Merge branch 'master' into cmake-2 2015-09-27 14:23:00 +02:00
Thomas Gubler 0a79c809ad fix 'ignoring return value of function declared with warn_unused_result' 2015-09-27 13:32:17 +02:00
Thomas Gubler 1ae8483e2c fix 'unterminated function-like macro invocation', fixes #2913 2015-09-27 13:32:17 +02:00
Pavel Kirienko e2b801a323 Fixes 2911 2015-09-27 12:25:15 +02:00
Lorenz Meier ccf19d12f2 Commander: Provide better status feedback for sensor init / check routine 2015-09-26 17:20:08 +02:00
Lorenz Meier c97a2c4810 Merged master to cmake-2 2015-09-26 16:24:32 +02:00
Lorenz Meier 5d7be8b156 Merge pull request #2910 from jgoppert/cmake-2-ros
Added support for ros-sitl on cmake-2
2015-09-26 11:02:05 +02:00
Lorenz Meier fbde7b6f02 Merge pull request #2909 from michaelkoetter/vagrant-build
Fixed Vagrant provisioning
2015-09-26 10:59:54 +02:00
James Goppert 3c6d101792 Added support for ros-sitl. 2015-09-25 08:29:35 -04:00
Michael Kötter d4422f7018 Fixed Vagrant provisioning:
- Added "zip" package needed for build
- Run shell proviosioner as non-privileged (ie. "vagrant") user
2015-09-25 11:04:02 +02:00
Lorenz Meier acc9b29b56 Merge pull request #2906 from mcharleb/cmake-2-qurt-unbreakage
Cmake 2 qurt unbreakage
2015-09-25 01:03:01 +02:00
Mark Charlebois 3f758490a4 QuRT: move to HexagonTools 7.4 toolchain
Some subsystems error on frame size without the included patches.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-24 15:16:01 -07:00
Mark Charlebois 300932bde3 QuRT: fixes to unbreak cmake build for QuRT
Updated DSPAL version.
Fixed missing lib in config.
Fixed heafers for missing timespec definition.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-24 15:16:00 -07:00
Mark Charlebois 1abd61303f qurt: Added patch for Eigen to use latest version
Updated to 7.2 Hexagon toolchain

Fixed issuse with stack usage

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-24 15:16:00 -07:00
James Goppert 2a60ffd554 Added stdc_format_macros for all inttypes.h includes. 2015-09-24 17:44:27 -04:00
James Goppert 6cdb373abb Removed extra define from catapult launch. 2015-09-24 16:56:35 -04:00
James Goppert ed876b95c3 Added stdc_format_macros to err. 2015-09-24 16:54:45 -04:00
James Goppert 3bf06d242f Fix def for stdc format macros to match existing code. 2015-09-24 16:45:18 -04:00
James Goppert 2908a377cf Found stc macro def issue for sitl build on travis. 2015-09-24 16:43:57 -04:00
James Goppert b6d8fe3f01 Another fix for travis sitl build. 2015-09-24 16:27:09 -04:00
James Goppert 85cccbf9be Attempt 2 to fix posix sitl build for travis. 2015-09-24 16:21:27 -04:00
James Goppert ebbe322dba Attempt to fix odd travis sitl build error. 2015-09-24 16:16:49 -04:00
James Goppert bc1063c862 Merge branch 'master' into cmake-2 2015-09-24 16:03:28 -04:00
James Goppert fa69a4f1e0 Fixed debug script for cmake. 2015-09-24 16:00:16 -04:00
James Goppert b07e02527d Fixed catapult launch build error. 2015-09-24 15:59:47 -04:00
Lorenz Meier d7fc0ee53c Launch detection: Fix print statement 2015-09-23 22:42:36 +02:00
Lorenz Meier 0da9b4d715 Merge branch 'master' of github.com:PX4/Firmware into cmake-2 2015-09-23 21:17:15 +02:00
David Sidrane 05a08252ff Bugfix:pthread_create retuns 0 on success and positive error on error without errono set 2015-09-23 08:19:23 -10:00
David Sidrane a5ad7641e3 Updated Submodule NuttX with group delete fix and cstdlib fixes ==master 2015-09-23 08:17:16 -10:00
Lorenz Meier 27412ef2a2 Update README to include Snapdragon Flight 2015-09-23 19:45:10 +02:00
Lorenz Meier 996a6ee437 Commander: Do not lock in user on a single boot assignment failure 2015-09-23 18:36:29 +02:00
David Sidrane f5d399c9bd Merge pull request #2897 from PX4/master_uavcan_time_base
Update uavcan_main.cpp
2015-09-23 05:58:35 -10:00
David Sidrane 8eaf213edd Update uavcan_main.cpp 2015-09-23 05:32:14 -10:00
Lorenz Meier 7f7fb7c0e3 Merge pull request #2895 from PX4/master_uavcan_timesync_with_params
Master uavcan timesync with command line UAVCAN parameter operations
2015-09-23 16:44:27 +02:00
David Sidrane 2a36067cc7 Added reset to usage 2015-09-23 04:18:40 -10:00
David Sidrane 1996d2b55a Uavcan parameter and reset command line operations 2015-09-23 04:07:42 -10:00