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

8893 Commits

Author SHA1 Message Date
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
Nuno Guedes
8fef89d55c OP-596 - GCSController output Fix
The GCSController widget now outputs the correct throttle range (0..1) on the ManualControlCommand.Throttle.

(Also, some empty lines cleaning.)
2013-04-20 16:48:23 +01:00
Alessio Morale
8011a9476d OP-886 fixed a bug caused by wrong check for xSemaphoreTakeRecursive return code
Conflicts:
	flight/Libraries/alarms.c
2013-04-20 17:17:55 +02:00
sambas
074b391cc0 spring cleaning 2013-04-20 18:07:19 +03:00
Alessio Morale
dd37c31a07 OP-886 Fixes to styles, used enum for ExtendedAlarmStatus
Conflicts:
	flight/Libraries/inc/sanitycheck.h
	shared/uavobjectdefinition/systemalarms.xml
2013-04-20 16:33:38 +02:00
sambas
3512e7a657 Fix allowed frametypes 2013-04-20 15:09:24 +03:00
Philippe Renon
cfbd9b2728 OP-769 main.cpp various cleanups 2013-04-20 14:04:28 +02:00
sambas
8aa5748a8c Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-20 10:59:00 +03:00
Oleg Semyonov
220b4b5042 OP-886: use enum for extended alarm status field
See also:
    http://reviews.openpilot.org/cru/OPReview-430
    http://progress.openpilot.org/browse/OP-915
2013-04-20 02:10:40 +03:00
Philippe Renon
6074828807 OP-769 main.cpp fixed review comments (OPReview-440) 2013-04-20 00:04:06 +02:00
Oleg Semyonov
343a4b9015 OP-886: cosmetic style and spacing fixes 2013-04-20 00:56:45 +03:00
Oleg Semyonov
cb068f507b Merge remote-tracking branch 'origin/next' into amorale/OP-886_sanitychecks 2013-04-19 23:43:42 +02:00
Oleg Semyonov
5e942bbd6d gcs: fix weird Windows build error if python is called w/o quotes
This fixes two problems:
- if OPENPILOT_TOOLS_DIR is set using backslashes, they should be
  converted to forward ones. Otherwise on Windows it can't run the
  program.
- for some weird reason the python called without quotes (regardless
  of full path used or not) tries to open whole command line as a file
  instead of the 1st parameter only. This works as it should from bash
  prompt. But executed by make it fails on Windows.
2013-04-19 22:54:55 +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
72a2d1a50e style: use 2 spaces and full stop for UAVO comments (as used in other objects)
+review OPReview-430
2013-04-19 18:47:56 +03:00
Corvus Corax
6cb2d2b39d updated in code documentation, use of some enums in callbackscheduler.h 2013-04-19 17:25:42 +02:00
Corvus Corax
28ac515064 moved Callback Scheduler startup in front of module task startup 2013-04-19 15:39:12 +02:00
Oleg Semyonov
efeb7c4890 Merge remote-tracking branch 'origin/cyr/yawzero' into next 2013-04-19 15:30:57 +03:00
Oleg Semyonov
da68ac1c8b Merge remote-tracking branch 'origin/amedee/OP-678' into next
+review OPReview-433
OP-678 #resolve #comment Thanks Philippe! Merged to next. Needs testing.
2013-04-19 12:58:56 +03:00
Corvus Corax
4d1729c415 syntax cleanup and betterheader comments 2013-04-19 09:07:35 +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
Corvus Corax
12211afe22 Test suite to test callback scheduler 2013-04-18 18:58:50 +02:00
Corvus Corax
17e8268e81 typo fix in callback scheduler 2013-04-18 18:35:57 +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