1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
Commit Graph

3900 Commits

Author SHA1 Message Date
Brian Webb
9bb3b5870c OP-914: Reformatted the RadioComBridge module. 2013-04-27 01:45:04 +01:00
Brian Webb
a9079bfb7e OP-914: Additional cleanup of the RFM22B driver code. Updated to code to the current coding standard. Added Doxygen documentation. Rearranged functions into functional groups to simplify reading the code. 2013-04-27 01:44:55 +01:00
Brian Webb
77b99cdafa OP-914 - Converted PIOS_RFM22B_Validate back into a normal function from an inline. 2013-04-27 01:44:39 +01:00
Alessio Morale
b21146b8e3 OP-917 bootloader updater for F4 targets. Initial commit 2013-04-27 00:56:47 +02:00
Oleg Semyonov
47619c9937 Make F4 pios debug pins compilable, still should be revised for real use 2013-04-26 21:04:10 +03:00
Oleg Semyonov
45f456580f Fix pios debug pin functions and defines (thanks to Mathieu for the patch) 2013-04-26 18:18:31 +03:00
Oleg Semyonov
fa8c2f239c Merge remote-tracking branch 'origin/amedee/OP-921' into next 2013-04-26 17:43:26 +03:00
Oleg Semyonov
18f7d7488b Fix directory name case for merged sambas/diffnext 2013-04-26 17:07:44 +03:00
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
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
Philippe Vanhaesendonck
b3de04d09f Handle Mach-o object format for UAVOs
Jira OP-921
2013-04-24 22:39:39 +02: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
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
21e7e95f87 Merge remote-tracking branch 'origin/os/add-uncrustify' into next 2013-04-24 02:31:41 +02: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
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
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
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
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
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
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
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
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
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
Corvus Corax
6f1bb94718 Delayed Callback Scheduler is now able to schedule delayed execution at an arbitrary time in the future 2013-04-18 14:17:29 +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
sambas
36d6c01864 proper floats + formatter 2013-04-17 21:23:49 +03: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
ab8ab4bcc6 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-15 17:41:06 +03:00
Oleg Semyonov
3b3377e6f4 Merge remote-tracking branch 'origin/os/friendly-toolchain-install' into next 2013-04-15 01:24:42 +02:00
sambas
388489226d typo fix, fix EE_BANK usage 2013-04-14 13:08:09 +03:00
sambas
0c13fbbee6 flashsettings and WDG for osd, revert the uavobjectmanager revert. 2013-04-14 12:43:37 +03:00
sambas
bb4aa08a15 Merge remote-tracking branch 'origin/sambas/diffnext' into amorale/osd_settings_on_flash 2013-04-14 12:32:26 +03:00
sambas
589290dbd7 POI orbit + some code run thru code formatter 2013-04-14 12:23:47 +03:00
sambas
6989468d17 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
	.gitignore
2013-04-14 10:13:51 +03:00
Richard Flay (Hyper)
afb8a20b6f OP-913: tweaked some UAVO related struct alignments to attempt to ensure that UAVO data fields end up being 4 byte aligned on the heap. Also fixed a memset issue in the initialisation code for multi-instance UAVOs .
+review OPReview
2013-04-14 11:52:56 +09:30
Corvus Corax
87ed9a8be2 reimplemented delayed callback scheduler to allow dispatching from ISR's and multiple schedulers with different task priorities 2013-04-14 04:16:34 +02:00
Oleg Semyonov
afbb11f43e Fix 'variable not used' warning. Still needs to be reworked for timing 2013-04-14 02:11:23 +02:00
Corvus Corax
bbb83752f7 rebased delayed callback scheduler 2013-04-13 21:50:47 +02:00
Oleg Semyonov
03a4ca545f Remove stray '}' in a makefile 2013-04-12 11:51:18 +02:00
Oleg Semyonov
8ab580ae82 Remove stray '}' in a makefile 2013-04-12 12:50:12 +03:00
Oleg Semyonov
34b15fedaf OP-719: make python_install (Windows) 2013-04-12 10:56:10 +02:00
Oleg Semyonov
bc4d25242f makefile: use the same coding style for all make variables 2013-04-12 10:55:23 +02: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
sambas
24f1362cfe Merge remote-tracking branch 'origin/next' into sambas/diffnext 2013-04-07 18:21:59 +03:00
Brian Webb
e27be3f594 Removed code for per message channel hop. 2013-04-07 15:59:31 +01:00
sambas
e87d7f2202 Merge branch 'sambas/diffnext' of ssh://git.openpilot.org/OpenPilot into sambas/diffnext 2013-04-07 14:57:21 +03: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
Alessio Morale
71de38f2d5 OP-908 Uniform handling of M_PI using a Floating counterpart F_PI, explicitly define integer constants as float when used in floating point calculations
+review OPReview-436
2013-04-06 23:07:06 +02: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
Alessio Morale
ce6f84063c OP-908 Cleanup for unwanted double precision math on float data.
- Use float counterpart instead of double precision function when dealing with float data
- Force float data type for decimal constants

+review OPReview
2013-04-06 16:45:05 +02:00
Alessio Morale
c801ca681c OP-900 update FreeRTOS to 7.4.0
also added an howto_update.txt file that list the necessary modifications to FreeRTOS files
+review OPReview
2013-04-06 15:05:39 +02:00
Brian Webb
4564718708 Added setting of max RF power and initial frequency on Revo. 2013-04-06 04:28:25 +01:00
Brian Webb
fef2c16f5a RFM22B: Changed the connection process. Now the coordinator waits to receive a status packet from a modem that it is bound to before it sends the connection request. 2013-04-06 02:25:59 +01:00
Brian Webb
948038f655 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-06 01:32:36 +01:00
Brian Webb
c330db3a28 Added setting of min/max frequencies on OPLink coordinator. 2013-04-06 01:32:15 +01:00
Oleg Semyonov
5bb6b56b4a OP-772: Normalize line endings 2013-04-05 23:46:56 +03:00
Oleg Semyonov
3bebec22f7 OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work)
This is a part of OP-726, OP-727 tasks to normalize source code.
Use the following to normalise your local repository to be able to merge:

git rm --cached -r .
git diff --cached --name-only -z | xargs -0 git add
git commit -m "Normalise line endings"
git ls-files -z | xargs -0 rm
git checkout .
2013-04-05 23:43:58 +03:00
Alessio Morale
f30692836a OP-886 Fixes to styles
+review OPReview-430
2013-04-04 20:11:57 +02:00
Oleg Semyonov
de4ca359dd Merge remote-tracking branch 'origin/os/OP-719_arm-sdk-update' into next 2013-04-04 12:09:33 +02:00
Alessio Morale
13dd1178a8 OP-886 Fixes to styles: testing style settings for Eclipse
+review OPReview-430
2013-04-03 19:26:25 +02:00
Brian Webb
61712be03d Added 57600 kbps air datarate mode, and added setting of registers 69 and 58. 2013-04-03 02:05:51 +01:00
sambas
47a7659147 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-02 20:40:41 +03:00
sambas
d776d82518 Does this fix simposix and make bamboo happy 2013-04-02 19:57:40 +03:00
Alessio Morale
23c0c3585c OP-886 Fixes to styles and includes
+review OPReview-430
2013-04-01 16:41:12 +02:00
Brian Webb
4778a12070 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-01 14:30:46 +01:00
Alessio Morale
9264c8b4e2 Merge remote-tracking branch 'origin/amorale/OP-881_flashautodetect' into next 2013-03-31 18:06:52 +02:00
Brian Webb
538d854627 Changed test for GCSRECEIVER in OPLink to PIOS_INCLUDE_GCSRCVR to match new define in pios_config. 2013-03-31 16:37:14 +01:00
Oleg Semyonov
b67ce783f5 OP-719: upgrade ARM SDK to 4.7-2012q4, use 'make arm_sdk_install' to install
+review OPReview
2013-03-31 16:59:00 +02:00
Alessio Morale
45b0e787a4 OP-886 Improvements to sanitychecks
Added an Extensions to Alarm for detailed status/substatus reporting.
Extended Alarms are the first in the Alarm structure and have corresponding fields in Status and Substatus structures.
Also added a filter to the HWsettings update to prevent to block arming when actual settings have not changed.

+review OPReview
2013-03-30 19:57:16 +01:00
Alessio Morale
8698bcfb84 Moved OSD settings from SDCard to mcu internal flash memory 2013-03-30 15:47:22 +01:00
sambas
e43e5c5028 Add missing flightmodes into sanitycheck, pathfollower needs to be running before sanitycheck runs 2013-03-30 14:57:43 +02:00
Brian Webb
1cac81b3e8 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
Conflicts:
	flight/targets/PipXtreme/System/inc/pios_config.h
	flight/targets/RevoMini/System/inc/pios_config.h
2013-03-29 17:17:55 -07:00
Oleg Semyonov
ca0910370f OP-881: flashfs: coding style fixes according to OPReview-423
+review OPReview-423
2013-03-29 11:26:56 +02:00
Alessio Morale
46e9e60e76 OP-881 fixed for stile compliance, added test and assertions on flash init for revolution and CC targets
+review OPReview-423
2013-03-29 00:30:28 +01:00
sambas
2557600257 uavobjects thing that fixes sdcard settings save on osd. Can be reverted when fix found. 2013-03-28 18:35:42 +02:00
sambas
4f7e37651c F4 CPU temp fix(revo), I think rm still not working 2013-03-28 18:34:31 +02:00
sambas
5ded8c6dfc VTOL path fixes
Flight mode fixes
POI mode
AutoLand Tests
Simple stabilization Shortest way yaw fix
GCS map and pathplanner fixes
2013-03-28 18:29:26 +02:00
sambas
77cae9ffc3 MagBaro Extension board module
OSD update
OSD output module for FC
Sonar update
Flight mode fixes + poi
2013-03-28 18:20:50 +02:00
Alessio Morale
e68aeb0c8e OP-881 Make PIOS_Flash_Jedec_Init able to configure the flash chip based on Jedec Id returned using a catalog of known flash chips.
+review OPReview
2013-03-27 00:26:47 +01:00
Oleg Semyonov
9335a50b18 Makefile: use upper case for MODULE_MODULENAME_BUILTIN macros
+review OPReview-422
2013-03-25 16:02:16 +02:00
Oleg Semyonov
17600ed09f PyMite: remove from simposix Makefile and use library instead 2013-03-25 02:59:40 +02:00
Oleg Semyonov
8e7712a13f PyMite: fix nasty build bug with open file problem on Windows
In fact, the cause of that error was badly written makefile rule which
generated 5 same files 5 times. If used with make -j, it tried to open
the same files for writing at the same time. Windows doesn't like this.
This is fixed now.
2013-03-25 02:03:35 +02:00
Brian Webb
1979e8b57f Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-03-24 16:57:59 +01:00
Oleg Semyonov
30b362a5fa entire-flash.py: fix comment 2013-03-24 14:12:08 +02:00
Oleg Semyonov
8f977a4411 Final step: lot of small fixes, last commit in this commit series
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.

NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.

The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.

Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
  configs, only comment/uncomment them. Adding new PIOS options, please
  propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
  files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
  Makefile. As such, all dependencies are checked and accounted, no
  more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
  using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
  file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
  clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
  in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
  on command line, GCS build will depend on the resource, so all fw_*.opfw
  targets will be built and embedded into GCS. By default GCS does not
  depend on resource, and will be built w/o firmware (unless the resource
  files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.

Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.

Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style

Merging this, please use --no-ff git option to make it the real commit point

Conflicts:
	A lot of... :-)
2013-03-24 13:06:24 +02:00