1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
LibrePilot/flight/PiOS
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
..
Boards Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-11 14:42:49 +01:00
Common Merge branch 'amorale/OP-900_update_freertos_740' into next 2013-04-23 21:57:50 +02:00
inc Merge branch 'amorale/OP-908_clean_float_math' into next 2013-04-23 02:09:01 +02:00
posix Merge branch 'amorale/OP-900_update_freertos_740' into next 2013-04-23 21:57:50 +02:00
STM32F4xx Merge branch 'amorale/OP-900_update_freertos_740' into next 2013-04-23 21:57:50 +02:00
STM32F10x Merge branch 'amorale/OP-900_update_freertos_740' into next 2013-04-23 21:57:50 +02:00
pios_sim_posix.h OP-772: Normalize line endings 2013-04-05 23:46:56 +03:00
pios.h 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. 2013-04-09 01:10:41 +02:00