Oleg Semyonov
e2fd821e97
Merge remote-tracking branch 'origin/next' into sambas/diffnext
...
Conflicts:
make/common-defs.mk
2013-04-26 16:31:19 +03:00
sambas
abe3742217
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
...
Conflicts:
flight/Libraries/CoordinateConversions.c
flight/Libraries/paths.c
flight/Modules/System/systemmod.c
flight/PiOS/STM32F4xx/pios_sys.c
flight/targets/boards/coptercontrol/pios_board.h
flight/targets/boards/revolution/pios_board.h
flight/targets/boards/revoproto/pios_board.h
2013-04-25 17:26:49 +03:00
Oleg Semyonov
25d0e8fcab
Rename PiOS/STM32F10x->PiOS/stm32f10x, PiOS/STM32F4xx->PiOS/stm32f4xx
2013-04-25 13:13:39 +03:00
Oleg Semyonov
f20f89da35
Rename PiOS/Common->PiOS/common
2013-04-25 13:13:39 +03:00
Oleg Semyonov
66db978244
Rename Libraries->libraries, Modules->modules
2013-04-25 13:13:36 +03:00
Oleg Semyonov
0414231408
Move uncrustify config from flight to make/uncrustify/
2013-04-24 22:49:17 +03:00
Oleg Semyonov
748b28f4f4
Move doxygen config from flight to make/doxygen/
2013-04-24 22:44:40 +03:00
Oleg Semyonov
33ed88e696
Merge remote-tracking branch 'origin/next' into os/OP-899_board-rename-and-config-rework
2013-04-24 21:28:33 +02:00
Oleg Semyonov
15fd460275
Normalize line endings for *.sh after .gitattributes update
2013-04-24 20:09:38 +02:00
Oleg Semyonov
0bff67822b
tools: yet another fix for md5 calculation
2013-04-24 16:42:47 +03:00
Oleg Semyonov
f283b66a2f
uncrustify: add config comment for "don't indent this section" option
2013-04-24 12:52:36 +03:00
Oleg Semyonov
21e7e95f87
Merge remote-tracking branch 'origin/os/add-uncrustify' into next
2013-04-24 02:31:41 +02:00
Oleg Semyonov
406339eb49
Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3
...
Conflicts:
flight/Libraries/inc/op_dfu.h
flight/Libraries/op_dfu.c
flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
flight/targets/Bootloaders/OSD/op_dfu.c
flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h
flight/targets/boards/coptercontrol/bootloader/op_dfu.c
flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h
flight/targets/boards/oplinkmini/bootloader/op_dfu.c
flight/targets/boards/osd/bootloader/inc/op_dfu.h
flight/targets/boards/osd/bootloader/op_dfu.c
flight/targets/boards/revolution/bootloader/inc/op_dfu.h
flight/targets/boards/revolution/bootloader/op_dfu.c
flight/targets/boards/sensortest/bootloader/inc/op_dfu.h
flight/targets/boards/sensortest/bootloader/op_dfu.c
make/boot-defs.mk
2013-04-24 00:37:39 +03:00
Alessio Morale
57ca1639cc
Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next
...
Conflicts:
flight/Libraries/op_dfu.c
flight/PiOS/STM32F10x/pios_iap.c
flight/PiOS/inc/pios_iap.h
flight/targets/BootloaderUpdater/main.c
flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
flight/targets/Bootloaders/CopterControl/op_dfu.c
flight/targets/Bootloaders/OSD/inc/op_dfu.h
flight/targets/Bootloaders/PipXtreme/op_dfu.c
flight/targets/Bootloaders/RevoMini/inc/op_dfu.h
flight/targets/Bootloaders/RevoMini/op_dfu.c
flight/targets/Bootloaders/Revolution/inc/op_dfu.h
flight/targets/Bootloaders/Revolution/op_dfu.c
ground/openpilotgcs/src/plugins/uploader/uploader.ui
make/apps-defs.mk
make/boot-defs.mk
2013-04-23 23:14:11 +02:00
Oleg Semyonov
3f2431c04f
OP-899: move board-specific pios_board.h files into board directories
2013-04-24 00:07:06 +03:00
Oleg Semyonov
f7332f6905
OP-899: remove extra copy of pios_usb_data.c and move it level up
2013-04-24 00:07:06 +03:00
Oleg Semyonov
1dd20eca33
OP-899: move board_hw_defs.c under board directories and fix some includes
2013-04-24 00:07:06 +03:00
Oleg Semyonov
393b37fa7a
OP-899: move board-info.mk from make/boards to board directories
2013-04-24 00:07:06 +03:00
Oleg Semyonov
f7f842687a
OP-899: rename System to firmware and move Makefile into it
2013-04-24 00:07:06 +03:00
Oleg Semyonov
399cafe7d7
OP-896: rename RevoMini to Revolution
2013-04-24 00:07:05 +03:00
Oleg Semyonov
6afbef01eb
OP-896: rename Revo to SensorTest
2013-04-24 00:07:04 +03:00
Oleg Semyonov
fdd0ed39e0
OP-896: remove old board configs (ESC, INS, OpenPilot)
2013-04-24 00:07:04 +03:00
Oleg Semyonov
1ded536056
OP-896: rename OPLink to OPLinkMini
2013-04-24 00:07:04 +03:00
Brian Webb
ba7b712cf1
Changed all references to PipXtreme on flight side to OPLink.
2013-04-24 00:07:03 +03:00
Oleg Semyonov
f9816175d0
tools: replace md5sum by openssl (now works on Windows/Linux/OSX)
...
See also: OP-719, OPReview-441
2013-04-22 21:37:34 +02:00
Oleg Semyonov
34983fa643
uncrustify: add some alignments to the configuration
...
See also: OPIN-3
2013-04-22 21:35:45 +02:00
Oleg Semyonov
8d1e1fdbc0
tools: make uncrustify_install target, script and base config file
...
See also: OPIN-3
2013-04-22 21:35:25 +02:00
sambas
8aa5748a8c
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-20 10:59:00 +03:00
Oleg Semyonov
491e89b165
make: sort wildcard sources to make binaries identical on all platforms
...
Thanks to Amedee for finding the cause of the difference and CorvusCorax
for participating in the discussion.
2013-04-19 20:43:31 +02:00
Oleg Semyonov
f15249ff07
make: fix bu_* targets
2013-04-18 17:50:34 +03:00
Oleg Semyonov
509a1b4fe1
make: fix *_program targets (were broken for firmware)
2013-04-18 17:37:12 +03:00
Oleg Semyonov
b7de3c99d8
tools: fix typo in comments
2013-04-18 16:03:05 +02:00
Oleg Semyonov
f7236eb180
tools: add Linux 64bit native ARM toolchain
2013-04-18 15:45:38 +03:00
Oleg Semyonov
61bb82ca15
gcs: find python in tools building with Qt-Creator
...
This fix uses the same approach as OpenPilot toolchain system,
but for build started from Qt-Creator.
2013-04-17 19:08:02 +02:00
Oleg Semyonov
59f8a99ab7
make: warn users about old ARM toolchain instead of cryptic 'no such file' error
2013-04-16 21:26:36 +02:00
sambas
ab8ab4bcc6
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
2013-04-15 17:41:06 +03:00
Oleg Semyonov
354924deed
OP-719: suggest to use native Qt 4.8.x package on Linux and OSX
...
+review OPReview-441
2013-04-14 23:46:15 +02:00
Oleg Semyonov
d3ad4d3106
OP-719: provide pre-fetch and post-extract options to install template
...
+review OPReview-441
2013-04-14 23:46:14 +02:00
sambas
388489226d
typo fix, fix EE_BANK usage
2013-04-14 13:08:09 +03:00
sambas
bb4aa08a15
Merge remote-tracking branch 'origin/sambas/diffnext' into amorale/osd_settings_on_flash
2013-04-14 12:32:26 +03:00
sambas
589290dbd7
POI orbit + some code run thru code formatter
2013-04-14 12:23:47 +03:00
Oleg Semyonov
159dae9c9b
OP-719: print error message if curl is not available and stop
...
+review OPReview-441
2013-04-14 04:17:10 +03:00
Oleg Semyonov
28314ec170
OP-719: add linux x64 version of qt-4.8.4
...
It seems we must ship GCS with all Qt libs like we do for Windows.
On Ubuntu x64 the GCS built with this crashes using system libs.
But since it's possible to build GCS using natively installed
Qt SDK, it is not a problem for now. Something is better than
nothing, and two ways of building are better then just one.
+review OPReview-441
2013-04-13 22:51:33 +03:00
Oleg Semyonov
5be0a1919e
OP-719: add md5 checksumming
2013-04-12 10:56:12 +02:00
Oleg Semyonov
3967874996
OP-719: use common tool install template
2013-04-12 10:56:11 +02:00
Oleg Semyonov
34b15fedaf
OP-719: make python_install (Windows)
2013-04-12 10:56:10 +02:00
Oleg Semyonov
c0878f290d
OP-719: make qt_sdk_install (Linux)
2013-04-12 10:56:08 +02:00
Oleg Semyonov
e4d91218b6
OP-719: make qt_sdk_install mingw_install (Windows)
2013-04-12 10:56:07 +02:00
Oleg Semyonov
ea06337573
OP-719: make/scripts/win_sdk_install.sh
2013-04-12 10:56:06 +02:00
Alessio Morale
09d2ba1d25
OP-874 merge of amorale/OP-874_gcs_rescue_erase_settings in next.
...
+review OPReview-421
2013-04-08 01:10:37 +02:00
