1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-12 20:08:48 +01:00
Commit Graph

1315 Commits

Author SHA1 Message Date
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
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
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
21e7e95f87 Merge remote-tracking branch 'origin/os/add-uncrustify' into next 2013-04-24 02:31:41 +02: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
3f2431c04f OP-899: move board-specific pios_board.h files into board directories 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
Oleg Semyonov
fe1a6b1c5b OP-896: Linux and Mac are case-sensitive 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
594b44118f Merge branch 'next' into amorale/OP-911_mpu6000_fix_isr 2013-04-22 23:25:19 +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
731ee3e19d Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
2013-04-22 21:29:04 +03:00
Oleg Semyonov
97d4e9178b Merge remote-tracking branch 'origin/lilvinz/dsmx_zero_fix' into next 2013-04-20 22:14:23 +02:00
sambas
074b391cc0 spring cleaning 2013-04-20 18:07:19 +03: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
Alessio Morale
61be4811f5 OP-900 Various fixes from OPReview-435
+review OPReview-435
2013-04-19 00:00:28 +02:00
Alessio Morale
f005485e63 OP-900 Switched Simposix to common FreeRTOS version
+review OPReview-435
2013-04-18 23:27:48 +02:00
Alessio Morale
36c0ec100b OP-908 added pios_constants.h containing some (more or less) useful physical constants, added other float constants to pios_math.h fixes for code style.
+review OPReview-436
2013-04-18 21:03:25 +02:00
Alessio Morale
4077dfde56 OP-874 Added visual (heartbeat led flashing) indication of flash format being performed.
+review OPReview-421
2013-04-18 00:47:14 +02:00
Alessio Morale
a825772389 OP-911: Use SPI_ReleaseBusISR within isr, changed a malloc with pvPortMalloc for coherence with the rest of PiOS
+review OPReview-44
2013-04-17 23:42:20 +02:00
Alessio Morale
ae62517600 OP-911: Added SPI_ReleaseBusISR counterpart
+review OPReview-447
2013-04-17 23:40:49 +02:00
Alessio Morale
66b1d285d5 OP-911: Fixed SPI_ClaimbusISR for F1
+review OPReview-447
2013-04-17 22:41:53 +02:00
Alessio Morale
6214d0d471 OP-911: First part of the rework: Fixed non isr call for claimbus, changed delays at startup to resolve a intermittent failure at MPU6000 initialization on reboot.
+review OPReview
2013-04-17 19:22:56 +02:00
sambas
a40f8f5ebd Bytes!! enable RM CPU temp 2013-04-17 17:29:08 +03:00
sambas
78127ae817 Fix flashsize address, ran thru formatter 2013-04-16 16:50:41 +03:00
sambas
0c13fbbee6 flashsettings and WDG for osd, revert the uavobjectmanager revert. 2013-04-14 12:43:37 +03:00
sambas
6989468d17 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
	.gitignore
2013-04-14 10:13:51 +03:00
Brian Webb
28bfc2725c Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-11 14:42:49 +01:00
Alessio Morale
cc6d19e40a OP-908 added pios_math.h and pios_helper.h to contains all the various math and general macros/constants. Fixed remaining constants still defined as double.
+review OPReview-436
2013-04-09 01:10:41 +02:00
Alessio Morale
f68a038af0 OP-900 Updated howto_upgrade.txt doc
+review OPReview-435
2013-04-08 23:31:08 +02:00
Alessio Morale
81156ad132 OP-900 Changed memory allocation strategy for F1 to use portBYTE_ALIGNMENT alignment for stacks and portBYTE_HEAP_ALIGNMENT for generic mallocs
+review OPReview-435
2013-04-08 22:55:49 +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
Brian Webb
e27be3f594 Removed code for per message channel hop. 2013-04-07 15:59:31 +01:00
sambas
fb8273459f Normalize line endings 2013-04-07 09:49:13 +03:00
Brian Webb
90b0987e43 Fixed setting max Tx power on Revo. 2013-04-07 02:17:09 +01:00
Brian Webb
95c150213a Don't send GCSReceiver when using OPLink receiver (on Revo). 2013-04-06 17:57:16 +01:00
Brian Webb
d36cf828bc RFM22B: Don't send a connection request from a non-coordinator. 2013-04-06 16:35:12 +01:00