Commit Graph

14117 Commits

Author SHA1 Message Date
James Goppert 31c3f4e40f Fix for travis mixer cat. 2015-09-11 00:49:11 -04:00
James Goppert 4bce702ed1 Added rt library to link for posix to fix travis build. 2015-09-11 00:45:23 -04:00
James Goppert 9ab9e1f142 Set version to correct number. 2015-09-11 00:31:36 -04:00
James Goppert f94e3b3aaa Fixed config check. 2015-09-11 00:28:13 -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 ec209f13f0 Simplified config handling. 2015-09-10 23:53:25 -04:00
James Goppert 3d52582dd7 Merge branch 'cmake-2' of github.com:jgoppert/Firmware into cmake-2
Conflicts:
	CMakeLists.txt
2015-09-10 23:44:39 -04:00
James Goppert 07851b79c2 Work on config only for cmake arguments. 2015-09-10 23:43:59 -04:00
James Goppert 706905f35e Merge pull request #44 from mcharleb/cmake-mc
cmake: Missed missed instance of config_
2015-09-10 23:43:29 -04:00
Mark Charlebois 3de04cf6f4 cmake: fixes for posix configs
The posix eagle targets were fixed to include the px4_impl_posix.cmake file

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 20:17:38 -07:00
Mark Charlebois ad4e31c88a cmake: Missed anm insuance of config_
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 20:07:38 -07:00
James Goppert 97cb25254d Merge pull request #43 from mcharleb/cmake-mc
cmake: fixed posix configs
2015-09-10 23:04:00 -04:00
Mark Charlebois 98897960e1 cmake: removed config_ prefix
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 20:02:31 -07:00
Mark Charlebois 0047b38c54 cmake: added Toolchain-arm-linux-gnueabihf
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 19:52:23 -07:00
Mark Charlebois 3b118a0ea7 cmake: Removed obsolete UPLOAD and TEST logic
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 19:43:54 -07:00
Mark Charlebois 4beabff26b cmake: fixed posix configs
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 19:38:22 -07:00
James Goppert 3104a974a9 Merge pull request #42 from mcharleb/cmake-mc
Cmake mc
2015-09-10 22:30:42 -04:00
Mark Charlebois cbb8ad19e5 cmake: Proof of concept for build without Makefile
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 19:15:11 -07:00
Mark Charlebois 5aa3c45b63 cmake: Unbreak all qurt and posix targets
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 19:01:51 -07:00
James Goppert 813a1219a5 Work on travis, set package generators for cpack. 2015-09-10 21:54:58 -04:00
Mark Charlebois d5a404896d Merge branch 'cmake-2' of https://github.com/jgoppert/Firmware into cmake-mc 2015-09-10 18:39:12 -07:00
Mark Charlebois 270bc2ef5d cmake: Fixed configs to use px4_get_config
The previous function name was changed to px4_get_config

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 18:37:54 -07: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
James Goppert 2238c09b74 Merge pull request #41 from mcharleb/cmake-mc
Cmake mc
2015-09-10 19:58:45 -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
Mark Charlebois 2a77ea6b34 Merge branch 'cmake-2' of https://github.com/jgoppert/Firmware into cmake-mc 2015-09-10 15:01:19 -07:00
Mark Charlebois 8dc5d7532e Added more eagle build configurations
The config_qurt_eagle_travis.cmake target is for CI

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 15:00:20 -07:00
James Goppert 422d47dd9a Merge pull request #40 from mcharleb/cmake-mc
cmake: Added dspal and eigen32 to top level CMakeLists.txt
2015-09-10 17:45:20 -04:00
James Goppert 6966331a88 Working on param xml gen. Haven't updated qurt config yet. 2015-09-10 17:44:27 -04:00
James Goppert 2bd0c2479e Makefile dep fix. 2015-09-10 16:25:32 -04:00
James Goppert a690fd12e0 Removed unneeded dep from makefile. 2015-09-10 16:21:52 -04:00
Mark Charlebois e3e00e92d7 Updated to newer version of dspal
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 12:59:45 -07:00
Mark Charlebois cdcebfdb6e Merge branch 'cmake-2' of https://github.com/jgoppert/Firmware into cmake-mc 2015-09-10 12:46:20 -07:00
James Goppert 149deeb11f Fixed autostart. 2015-09-10 14:38:09 -04:00
Mark Charlebois b09c8f3c9b cmake: Added dspal and eigen32 to top level CMakeLists.txt
Relying on inclusion of git_eigen32 and git_dspal targets to trigger
the submodule init and update

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 11:18:30 -07:00
James Goppert b073edc684 Set makefile default target explicity. 2015-09-10 14:08:03 -04:00
James Goppert 181d8db128 Merge branch 'master' into cmake-2 2015-09-10 14:03:48 -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 f7fe33e6a4 Removed old module list from nuttx firmware. 2015-09-10 12:40:34 -04:00
James Goppert b0f5ad671a Merge pull request #39 from mcharleb/cmake-mc
cmake: fixes for qurt build after refactoring
2015-09-10 12:33:56 -04:00
Mark Charlebois 08dc74afac cmake: fixes for qurt build after refactoring
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-09-10 09:29:21 -07:00
James Goppert cadc7280b7 Fixed makefile upload link. 2015-09-10 03:05:17 -04:00
James Goppert c66581d2ce Travis fixes. 2015-09-10 02:42:41 -04:00
James Goppert 3b231ec0a7 Travis fix for cmake. 2015-09-10 02:29:26 -04:00
James Goppert b7699bff5a Changes to travis for cmake build. 2015-09-10 02:21:40 -04:00
James Goppert 1eddfde439 Replaced awk with python script for bin_to_obj. 2015-09-10 02:03:29 -04:00
James Goppert 0286136c68 Addressed scope question. 2015-09-09 23:18:53 -04:00
James Goppert d0c89b8396 Attempted to fix qurt build, some cleanup of old module funcs. 2015-09-09 23:11:25 -04:00