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 |
|
Oleg Semyonov
|
4718e666ee
|
Merge remote-tracking branch 'origin/thread/OP-816_Setup_Wizard_Revo_Support' into next
|
2013-04-26 15:18:01 +03:00 |
|
sambas
|
e94c00e671
|
Fix revo BL compile error
|
2013-04-25 19:51:52 +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
|
7d5d513e75
|
Move flight/PiOS.osx->flight/pios/osx
It did not work and and is not fixed yet. But at least it is in place now.
|
2013-04-25 13:23:47 +03:00 |
|
Oleg Semyonov
|
9a53843168
|
Move flight/PiOS.win32->flight/pios/win32
It did not work and and is not fixed yet. But at least it is in place now.
|
2013-04-25 13:19:06 +03:00 |
|
Oleg Semyonov
|
b6e1331e5d
|
Rename flight/PiOS->flight/pios
|
2013-04-25 13:13:41 +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
|
f97cb211e3
|
Remove UTF-8 BOM from HISTORY.txt
|
2013-04-25 13:13:34 +03:00 |
|
Oleg Semyonov
|
189578629c
|
Update README.txt with project sites list
|
2013-04-25 13:13:34 +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
|
71465232f0
|
Remove obsolete flight/Doc/* files (they do not contain actual info)
|
2013-04-24 22:39:50 +03:00 |
|
Oleg Semyonov
|
8018050add
|
Move document from source repository to wiki
http://wiki.openpilot.org/display/Doc/UAVObjects+to+Widgets+Relations+Framework
|
2013-04-24 22:39:36 +03:00 |
|
Oleg Semyonov
|
0f6599d949
|
Move GPLv3.txt from flight/Doc/License/ to top directory and convert to CRLF
|
2013-04-24 22:39:28 +03:00 |
|
Oleg Semyonov
|
8f784ac6cb
|
flight: remove unnecessary #include "systemmod.h" from boards
|
2013-04-24 22:35:34 +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
|
e2bcac4e21
|
.gitattributes: add a note how to renormalize old branches for merge
|
2013-04-24 03:31:09 +03:00 |
|
Oleg Semyonov
|
8a3881b0cf
|
Move README.txt from flight to top, it points to OpenPilot Developer Manual
|
2013-04-24 02:14:35 +03:00 |
|
Oleg Semyonov
|
f9f721a76a
|
Reset executable bits from non-executable files (Windows legacy)
|
2013-04-24 01:18:46 +03:00 |
|
Oleg Semyonov
|
fb207bdaf7
|
OP-896: rename SensorTest to RevoProto
|
2013-04-24 00:57:33 +03: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
|
27195b7327
|
OP-899: move UAVObjects and UAVTalk one level up from targets
|
2013-04-24 00:07:07 +03: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
|
fce12662bc
|
OP-899: move bootloaders under board directories
|
2013-04-24 00:07:06 +03:00 |
|
Oleg Semyonov
|
f01655efed
|
OP-899: get rid of board_friendly names
|
2013-04-24 00:07:06 +03:00 |
|
Oleg Semyonov
|
c33ff12faa
|
OP-899: rename targets/common/CamelStyle to unix_style
|
2013-04-24 00:07:05 +03:00 |
|
Oleg Semyonov
|
63573fac16
|
OP-899: move EF and BU to targets/common
|
2013-04-24 00:07:05 +03:00 |
|
Oleg Semyonov
|
fc845888d3
|
OP-899: move board targets under targets/boards
|
2013-04-24 00:07:05 +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 |
|
Oleg Semyonov
|
fe1a6b1c5b
|
OP-896: Linux and Mac are case-sensitive
|
2013-04-24 00:07:04 +03:00 |
|
Oleg Semyonov
|
6cd963e423
|
OP-896: fix a conflict resolution typo
|
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 |
|
Alessio Morale
|
b4a4ada1b0
|
Merge branch 'amorale/OP-900_update_freertos_740' into next
Conflicts:
flight/PiOS/Common/Libraries/FreeRTOS/Source/croutine.c
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/FreeRTOS.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/StackMacros.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/croutine.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/list.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/mpu_wrappers.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/portable.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/projdefs.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/queue.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/semphr.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/task.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/include/timers.h
flight/PiOS/Common/Libraries/FreeRTOS/Source/list.c
flight/PiOS/Common/Libraries/FreeRTOS/Source/queue.c
flight/PiOS/Common/Libraries/FreeRTOS/Source/tasks.c
flight/PiOS/Common/Libraries/FreeRTOS/Source/timers.c
flight/PiOS/STM32F10x/Libraries/FreeRTOS/Source/portable/GCC/ARM_CM3/port.c
flight/PiOS/STM32F10x/Libraries/FreeRTOS/Source/portable/GCC/ARM_CM3/portmacro.h
flight/PiOS/STM32F10x/Libraries/FreeRTOS/Source/portable/MemMang/heap_1.c
flight/PiOS/STM32F10x/Libraries/FreeRTOS/Source/portable/MemMang/heap_2.c
flight/PiOS/STM32F10x/Libraries/FreeRTOS/Source/portable/MemMang/heap_3.c
flight/PiOS/STM32F10x/library.mk
flight/PiOS/STM32F4xx/Libraries/FreeRTOS/Source/portable/GCC/ARM_CM4F/port.c
flight/PiOS/STM32F4xx/Libraries/FreeRTOS/Source/portable/GCC/ARM_CM4F/portmacro.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/FreeRTOS.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/StackMacros.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/croutine.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/list.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/mpu_wrappers.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/portable.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/projdefs.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/queue.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/semphr.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/include/task.h
flight/PiOS/posix/Libraries/FreeRTOS/Source/list.c
flight/PiOS/posix/Libraries/FreeRTOS/Source/queue.c
|
2013-04-23 21:57:50 +02:00 |
|
Alessio Morale
|
2fe7139fc3
|
Merge branch 'amorale/OP-908_clean_float_math' into next
Conflicts:
flight/PiOS/Common/pios_rfm22b.c
|
2013-04-23 02:09:01 +02:00 |
|
Alessio Morale
|
37e17fb706
|
Merge branch 'os/OP-866_sanitychecks' into next
|
2013-04-22 23:56:59 +02:00 |
|