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

8382 Commits

Author SHA1 Message Date
Oleg Semyonov
c1dc7ccde7 Move OPLicenseTemplate.txt from top directory to make/templates
It's just one step. See also OP-891 for further changes.
2013-04-05 01:03:25 +03:00
Oleg Semyonov
eb9c6e48f2 tools: now OPENPILOT_* environment variables can use Windows style slashes 2013-04-05 00:42:56 +03:00
Oleg Semyonov
f57610dc78 tools: Makefile and sh.cmd minor updates (mostly comments) 2013-04-04 23:57:43 +03:00
Oleg Semyonov
7a5c04034f tools: update help message 2013-04-04 18:26:59 +03:00
Oleg Semyonov
cf110998a0 tools: fix MSYS tar problem with Windows path names with drive letter colon 2013-04-04 17:03:17 +02:00
Oleg Semyonov
f0780c96c6 tools: use global environment variables to set download and tools location
This allows to define OPENPILOT_DL_DIR and OPENPILOT_TOOLS_DIR to override
local tools download and installation directory. So the same toolchains
can be used for all working copies. Particularly useful for CI server
agents, but also for local installations.

Paths should use forward (unix-style) slashes.

If no OPENPILOT_* variables found, makefile internal DL_DIR and TOOLS_DIR
are used. They still can be overriden by the make command line parameters.
2013-04-04 16:33:19 +02:00
Philippe Vanhaesendonck
327b24c501 Tabs/Whitespaces cleanup - No code change
Jira OP-888 / OPReview-432
2013-04-04 14:52:16 +02:00
Oleg Semyonov
de4ca359dd Merge remote-tracking branch 'origin/os/OP-719_arm-sdk-update' into next 2013-04-04 12:09:33 +02:00
Oleg Semyonov
f82d66d217 OP-719: fix curl "invalid time" error if target file is missing
+review OPReview-431
2013-04-04 13:08:48 +03:00
Philippe Vanhaesendonck
c538488294 OSX package makefile cleanup
Jira OP-888
Build without Nokia SDK
2013-04-03 17:41:30 +02:00
Brian Webb
61712be03d Added 57600 kbps air datarate mode, and added setting of registers 69 and 58. 2013-04-03 02:05:51 +01:00
Oleg Semyonov
e24b66897b build: fix qmake ground/share copy commands for all platforms
Read share.pro comments for more details.

+review OPReview-429
2013-04-02 19:43:48 +03:00
Oleg Semyonov
17a687e79d Revert "Removed creation of extra directory level on Windows."
This reverts commit 7c85fa5885.
2013-04-02 10:20:15 +02:00
Brian Webb
4778a12070 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-01 14:30:46 +01:00
Oleg Semyonov
a0e24a69aa OP-719: upgrade ARM SDK to 4.7-2013q1 +review OPReview-431 2013-04-01 00:42:19 +03:00
Oleg Semyonov
03f7596689 OP-719: fix broken paths to other tools (still to be revised) +review OPReview-431 2013-03-31 21:52:58 +03:00
Alessio Morale
9264c8b4e2 Merge remote-tracking branch 'origin/amorale/OP-881_flashautodetect' into next 2013-03-31 18:06:52 +02:00
Oleg Semyonov
80e668411f build: remove extra libs, they are not used de-facto
+review OPReview-429
2013-03-31 18:06:43 +02:00
Brian Webb
538d854627 Changed test for GCSRECEIVER in OPLink to PIOS_INCLUDE_GCSRCVR to match new define in pios_config. 2013-03-31 16:37:14 +01:00
Oleg Semyonov
b67ce783f5 OP-719: upgrade ARM SDK to 4.7-2012q4, use 'make arm_sdk_install' to install
+review OPReview
2013-03-31 16:59:00 +02:00
Oleg Semyonov
3e815ca8d5 build: get rid of build/ground subdirectory, fix qt-creator builds
This changeset:
- moves all ground targets one level up, under build directory. The
  build/ground was created as a workaround, now unnecessary;
- fixes QtCreator builds, they are separated from command line builds;
- moves GCS autogenerated files into openpilotgcs-synthetics directory.

The resulting build subdirectory now looks like:

    build
        openpilotgcs             <- Qt-Creator build directory
        openpilotgcs-synthetics  <- version-info and opfw_resource
        openpilotgcs_debug
        openpilotgcs_release     <- Makefile build directory
        uavobject-synthetics
        uavobjgenerator

NOTE: you should update the shadow build path in QtCreator to build,
      not build/ground as before.

+review OPReview
2013-03-30 17:33:38 +02:00
Brian Webb
2568f41cf3 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-03-30 01:18:37 +01:00
Brian Webb
1cac81b3e8 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
Conflicts:
	flight/targets/PipXtreme/System/inc/pios_config.h
	flight/targets/RevoMini/System/inc/pios_config.h
2013-03-29 17:17:55 -07:00
Oleg Semyonov
ca0910370f OP-881: flashfs: coding style fixes according to OPReview-423
+review OPReview-423
2013-03-29 11:26:56 +02:00
Oleg Semyonov
4be3cd4978 Merge remote-tracking branch 'origin/amedee/OP-882' into next 2013-03-29 10:44:47 +02:00
Alessio Morale
46e9e60e76 OP-881 fixed for stile compliance, added test and assertions on flash init for revolution and CC targets
+review OPReview-423
2013-03-29 00:30:28 +01:00
Oleg Semyonov
587b12dd3e Makefile: using release build configuration for uavobjgenerator 2013-03-28 12:00:38 +02:00
Oleg Semyonov
beb13b32a9 OP-883: The 1st cleanup pass through PIOS and Makefiles system 2013-03-28 11:26:34 +02:00
Fredrik Arvidsson
c549218873 Fixed a bug related to the FusionAlgorithm selection in Revolution configuration. 2013-03-27 13:09:48 +01:00
Fredrik Arvidsson
0adb2b5b6f Merge remote-tracking branch 'origin/filnet/OP-853_fix_HITL_Options_page' into next 2013-03-27 11:09:52 +01:00
Fredrik Arvidsson
0d87f7509f Merge remote-tracking branch 'origin/filnet/OP-857_various_gcs_ui_polishing' into next 2013-03-27 11:08:52 +01:00
Fredrik Arvidsson
8423681d41 Merge remote-tracking branch 'origin/filnet/OP-833_gcs_options_dialog_ui_polishing' into next 2013-03-27 11:07:52 +01:00
Alessio Morale
e68aeb0c8e OP-881 Make PIOS_Flash_Jedec_Init able to configure the flash chip based on Jedec Id returned using a catalog of known flash chips.
+review OPReview
2013-03-27 00:26:47 +01:00
Philippe Vanhaesendonck
8625eba054 Fix for OSX Lions compiler
OSX 10.7 and above will need the -fpermissive flag to compile
2013-03-26 22:57:08 +01:00
Philippe Renon
caa9964fe5 OP-857 OP-876 made default Options dialog size even bigger 2013-03-26 00:37:39 +01:00
Oleg Semyonov
927977216b Revert "Makefile: better solution for MODULE_MODULENAME_BUILTIN name conversion"
The problem is that we have modules defined as:
    Airspeed
or
    Airspeed/revolution
or
    Extensions/MagBaro
and, probably
    Extensions/MagBaro/revolution
can be expected too.

It is impossible to get module name from such mixed cases.
So the better solution does not work for MagBaro, reverted.

This reverts commit 5d760d20fa.

+review OPReview-422
2013-03-25 17:27:47 +02:00
Oleg Semyonov
5d760d20fa Makefile: better solution for MODULE_MODULENAME_BUILTIN name conversion
Now it does not depend on board-specific part and uses module canonical name.

+review OPReview-422
2013-03-25 17:07:04 +02:00
Oleg Semyonov
9424be584c Makefile: fix MODULE_MODULENAME_BUILTIN generation bug for revo modules
This converts 'ModuleName/revolution' into 'ModuleName' for macro.

+review OPReview-422
2013-03-25 16:35:20 +02:00
Oleg Semyonov
9335a50b18 Makefile: use upper case for MODULE_MODULENAME_BUILTIN macros
+review OPReview-422
2013-03-25 16:02:16 +02:00
Oleg Semyonov
17600ed09f PyMite: remove from simposix Makefile and use library instead 2013-03-25 02:59:40 +02:00
Oleg Semyonov
8e7712a13f PyMite: fix nasty build bug with open file problem on Windows
In fact, the cause of that error was badly written makefile rule which
generated 5 same files 5 times. If used with make -j, it tried to open
the same files for writing at the same time. Windows doesn't like this.
This is fixed now.
2013-03-25 02:03:35 +02:00
Philippe Renon
f00a972e0e OP-833 cleaned up individual gadget options pages: dial and linear dial 2013-03-24 17:09:59 +01:00
Brian Webb
1979e8b57f Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-03-24 16:57:59 +01:00
Philippe Renon
eef25f4e9d OP-857 OP-876 fixed regression introduced while fixing this issue
(settings were not handled well anymore)
- added timing debug messages
- minor cleanups
2013-03-24 16:50:17 +01:00
Oleg Semyonov
9f0710f9d5 Makefile: add comment about Android GCS compatible version hashes 2013-03-24 17:00:15 +02:00
Oleg Semyonov
c2284d0c3f Makefile: fix package directory in the help message 2013-03-24 16:32:30 +02:00
Oleg Semyonov
30b362a5fa entire-flash.py: fix comment 2013-03-24 14:12:08 +02:00
Oleg Semyonov
8f977a4411 Final step: lot of small fixes, last commit in this commit series
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.

NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.

The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.

Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
  configs, only comment/uncomment them. Adding new PIOS options, please
  propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
  files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
  Makefile. As such, all dependencies are checked and accounted, no
  more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
  using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
  file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
  clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
  in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
  on command line, GCS build will depend on the resource, so all fw_*.opfw
  targets will be built and embedded into GCS. By default GCS does not
  depend on resource, and will be built w/o firmware (unless the resource
  files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.

Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.

Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style

Merging this, please use --no-ff git option to make it the real commit point

Conflicts:
	A lot of... :-)
2013-03-24 13:06:24 +02:00
Oleg Semyonov
151bd73bda Packaging: package ELF simposix file (executable), not OPFW (binary) 2013-03-24 13:06:23 +02:00
Oleg Semyonov
2eff6f5f3c Posix compile-only fix (still needs a lot of rework)
This is a patch to make simposix buildable. It does not use new
makefiles and should be reworked.

Conflicts:
	flight/targets/SimPosix/Makefile
2013-03-24 13:06:21 +02:00