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 |
|
Richard Flay (Hyper)
|
146e082e74
|
OP-913: ensured that UAVO data structs in .bss/.data sections and on the stack have 4 byte alignment. Also changed linker options to sort common and sort sections by alignment, which reduces the amount of fill/padding in the .bss and .data sections.
+review OPReview-444
|
2013-04-23 22:34:58 +09:30 |
|
Richard Flay (Hyper)
|
b22204e939
|
Merge branch 'next' into hyper/OP-913-flight-uavo-alignment
|
2013-04-23 19:14:57 +09:30 |
|
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 |
|
Alessio Morale
|
594b44118f
|
Merge branch 'next' into amorale/OP-911_mpu6000_fix_isr
|
2013-04-22 23:25:19 +02:00 |
|
Alessio Morale
|
84129dba40
|
OP-886 move systemalarm.h include inside guards in sanitycheck.h
+review OPReview-430
|
2013-04-22 22:58:37 +02:00 |
|
Philippe Renon
|
4690949575
|
Merge remote-tracking branch 'origin/next' into filnet/OP-907_gcs_vehicle_config_overhaul
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
|
2013-04-22 22:56:06 +02:00 |
|
Oleg Semyonov
|
aa30f093a2
|
Merge remote-tracking branch 'origin/next' into os/add-uncrustify
|
2013-04-22 22:01:56 +02: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 |
|
Philippe Renon
|
5f39206ebd
|
OP-907 vehicle config - removed uncessary setupUI calls.
+ fixed regression in multirotor config widget : svg display was not updated when switching frame type
+ formatting
|
2013-04-22 21:23:47 +02:00 |
|
sambas
|
731ee3e19d
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
|
2013-04-22 21:29:04 +03:00 |
|
Fredrik Arvidsson
|
538bedeb93
|
Merge remote-tracking branch 'origin/kevinv033/OP-791' into next
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
|
2013-04-22 20:14:05 +02:00 |
|
Fredrik Arvidsson
|
78d47e4185
|
Merge remote-tracking branch 'origin/filnet/OP-769_remove_hardcoded_en_locale' into next
|
2013-04-22 19:27:18 +02:00 |
|
Alessio Morale
|
d64b1e5c90
|
OP-908 clean some defines from sensor.c
+review OPReview-436
|
2013-04-20 23:46:32 +02:00 |
|
Oleg Semyonov
|
97d4e9178b
|
Merge remote-tracking branch 'origin/lilvinz/dsmx_zero_fix' into next
|
2013-04-20 22:14:23 +02:00 |
|
Oleg Semyonov
|
927e952a9d
|
Merge remote-tracking branch 'origin/os/OP-897_hide-unsupported-modes' into next
|
2013-04-20 21:23:00 +02:00 |
|
sambas
|
01df38008f
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
flight/Libraries/sanitycheck.c
flight/Modules/System/systemmod.c
|
2013-04-20 21:25:22 +03:00 |
|
Nuno Guedes
|
7bfc0f7962
|
Code style fixes
Had forgotten about the code style standards.
I hope it's more correct now.
|
2013-04-20 18:31:35 +01:00 |
|