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

204 Commits

Author SHA1 Message Date
Stacey Sheldon
207bd671ac usb: fix interfaces in USB HW defs for RevoMini 2013-05-11 22:38:27 +02:00
Alessio Morale
d555bd0673 Uses Internal flash for system settings storage repourposing external flash for "User" storage 2013-05-11 22:06:30 +02:00
Alessio Morale
687e75b2e2 Changes to board specific files to support UAVObject on a specific LogFS instance 2013-05-11 17:15:07 +02:00
Richard Flay (Hyper)
cf14608ebe Merge branch 'next' into hyper/OP-936_task-monitor-rework 2013-05-09 19:25:02 +09:30
Alessio Morale
93bad2e8c2 Merge branch 'amorale/OP-917_f4_bootloader_updater' into next
***** PLEASE NOTE  ***** From this revision all F4 based boards (Revolution/OSD) needs bootloader version  5 to boot properly

Conflicts:
	flight/pios/stm32f4xx/libraries/CMSIS2/Device/ST/STM32F4xx/Source/osd/system_stm32f4xx.c
	flight/targets/boards/osd/board-info.mk
	make/boot-defs.mk
	make/common-defs.mk
2013-05-07 21:02:41 +02:00
Richard Flay (Hyper)
fbc8bc698f OP-936: Merges branch 'next' into hyper/OP-936_task-monitor-rework, fixes damage/conflicts,
and brings the callback scheduler into the fold.

+review OPReview-461
2013-05-06 19:11:14 +09:30
Brian Webb
ae8286e99a OP-932: Fixes a bug that was preventing setting of Tx power on remote modem. 2013-05-06 01:03:15 +01:00
Corvus Corax
39fe6beb4b Merge branch 'corvuscorax/Attitude-fixes' into next
Conflicts:
	flight/libraries/insgps13state.c
	flight/modules/Attitude/revolution/attitude.c
2013-05-05 23:09:07 +02:00
Corvus Corax
946105cbe3 Merge branch 'next' into corvuscorax/Attitude-fixes 2013-05-05 17:44:59 +02:00
Alessio Morale
5a2c53804f OP-917 Make reboot over telemetry link works. UserDFU timeouts to the user application when no USB connection is found.
+review OPReview-456
2013-05-05 15:15:44 +02:00
Richard Flay (Hyper)
a2d8544931 OP-931: adds -Wextra compiler option for the flight code, and makes the bazillion code changes required
to make the flight code compile again. Needs careful review, particularly all the fixes for the
signed vs unsigned comparisons.

+review OPReview-459
2013-05-05 16:32:24 +09:30
Richard Flay (Hyper)
87fcf9fa8b Merge branch 'next' into hyper/OP-931_extra_compiler_warnings and update as necessary.
Hopefully properly fixes conflicts:
	flight/modules/Attitude/attitude.c
	flight/modules/ManualControl/manualcontrol.c
	flight/modules/Osd/WavPlayer/wavplayer.c
	flight/modules/Osd/osdgen/osdgen.c
	flight/modules/System/systemmod.c
	ground/uavobjgenerator/generators/flight/uavobjectgeneratorflight.cpp
2013-05-04 11:12:44 +09:30
Brian Webb
12e8adbdc4 OP-932: Fixes vitual com port and (not tested) raw comms over a UART on the OPLink. 2013-05-03 14:46:01 +01:00
Brian Webb
84a0f981e0 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into OP-932-Modularize_Radio_Driver 2013-05-03 14:08:40 +01:00
Corvus Corax
25c58ff074 Put all EKF initialisation values in a separate UAVObject EKFConfiguration,
adapted insgps13state.c/.h,
modules/Attitude/revolution,
configrevowidget.cpp,
accordingly.
2013-05-03 02:17:44 +02:00
Richard Flay (Hyper)
84e1a81f8b OP-936: Moves the task monitor code out of the flight library and into PiOS.
This move and rework also breaks the dependency of the task monitor on the UAVO subsystem,
and pushes the responsibility for updating the TaskInfo UAVO into the System module.

+review OPReview
2013-05-03 07:01:14 +09:30
Sambas
f7b9223827 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
	flight/modules/System/systemmod.c
	shared/uavobjectdefinition/taskinfo.xml
2013-05-02 09:00:12 +03:00
Brian Webb
80cef9dbcc OP-932: Fixes vitual com port and (not tested) raw comms over a UART on the OPLink. 2013-05-02 04:23:26 +01:00
Corvus Corax
e7dc665c14 Reworked Variance Objects, Setting for initial EKF variance 2013-05-01 19:16:29 +02:00
Corvus Corax
d77c690fe3 Merge branch 'next' into corvuscorax/Attitude-fixes
Conflicts:
	flight/modules/Attitude/revolution/attitude.c
2013-05-01 17:51:05 +02:00
Brian Webb
3b5bec167e Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into OP-932-Modularize_Radio_Driver 2013-05-01 15:30:24 +01:00
Brian Webb
344e5cbb66 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into OP-932-Modularize_Radio_Driver 2013-05-01 14:38:28 +01:00
Corvus Corax
a0ca66b0cd Merge branch 'corvuscorax/delayed_callbacks_with_delay' into next 2013-05-01 15:34:16 +02:00
Oleg Semyonov
7032d2a9d6 Merge remote-tracking branch 'origin/next' into os/uncrustify-config 2013-05-01 13:31:38 +02:00
Brian Webb
c3ea1bf3c0 OP-932: Fixed GPIO debugging on RevoMini (both V1 and V2) 2013-05-01 03:13:36 +01:00
Alessio Morale
37a0d2c99e OP-917 included a "compatibility" linker script used by the bootloader updater to ensure its compatibility with previous bootloader versions
+review OPReview-456
2013-05-01 01:14:30 +02:00
Alessio Morale
e1fdc41d7f OP-917 add Bootloader support for IRQStack to reside in CCSRAM
+review OPReview-456
2013-05-01 01:03:27 +02:00
Alessio Morale
1eef6a7f06 OP-917 Extended the program flash size to 3 128k sectors for F4 targets
+review OPReview-456
2013-05-01 01:00:48 +02:00
Oleg Semyonov
7c6da1df65 OPLinkMini: remove duplicated pvPortMalloc defines, fix #ifdef macro name
When the #define is reformatted by uncrustify, it differs from the same
in FreeRTOS default config and gives error. So the removal of it serves
to 2 purposes: removes the duplication and fixes uncrustified builds.
2013-04-30 16:54:30 +02:00
Oleg Semyonov
0394a3511c Rename template files to *.template to screen from uncrustify processing 2013-04-30 16:54:27 +02:00
Richard Flay (Hyper)
7937ae6296 OP-931: Makes flight code compile with -Wfloat-equal and -Wunsuffixed-float-constants enabled.
Also fixes warnings (and bugs) in F4 STM32_USB_OTG_Driver code, allowing -Werror to be enabled for all flight code.
Fixes all other compiler warnings that would otherwise cause the flight code to not compile with -Werror enabled.
Along the way, this also adds some uses of isnan() to various places rather than questionable tests for x != x and
x == x to check for NaNs.

+review OPReview
2013-04-30 20:36:42 +09:30
Corvus Corax
6e2c9b3c46 New EKFStateVariance UAVObject with EKF state variance information 2013-04-28 19:38:37 +02:00
Oleg Semyonov
19e374e8d1 OP-917: Minor fix for indents and spacing 2013-04-28 15:35:28 +03:00
Alessio Morale
41ecc09c3f OP-917 Various review fixes:
-Fixed casing for PIOS_BL_HELPER_FLASH_ERASE_BOOTLOADER
-fixed wrong condition in f1 bl_helper
-other cosmetic changes and use of stdbool in f1 pios_bl_helper
-remove now unused macros

+review OPReview-456
2013-04-28 10:19:08 +02:00
Alessio Morale
9f56fe9a1e OP-917 Makefiles cleanup. Get rid of ALL_BOARDS_BU as not all boards have one
+review OPReview-456
2013-04-28 10:14:50 +02:00
Corvus Corax
8d1baa2ceb OP-929: disable OveroSync module while its broken 2013-04-27 23:20:23 +02:00
Alessio Morale
78498910cf OP-917 Moved all the flash architecture related code to pios_bl_helper, get the flash addresses from board defines, major cleanup.
+review OPReview
2013-04-27 15:15:28 +02:00
Corvus Corax
e1233c7780 Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay
Conflicts:
	flight/targets/Revolution/System/inc/openpilot.h
	flight/targets/SimPosix/System/inc/openpilot.h
	flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
	flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
	flight/targets/boards/revolution/firmware/inc/openpilot.h
	flight/targets/boards/revoproto/firmware/inc/openpilot.h
2013-04-27 13:26:03 +02:00
Alessio Morale
b21146b8e3 OP-917 bootloader updater for F4 targets. Initial commit 2013-04-27 00:56:47 +02: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
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
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
748b28f4f4 Move doxygen config from flight to make/doxygen/ 2013-04-24 22:44:40 +03:00
Oleg Semyonov
8f784ac6cb flight: remove unnecessary #include "systemmod.h" from boards 2013-04-24 22:35:34 +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
1ded536056 OP-896: rename OPLink to OPLinkMini 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
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
sambas
074b391cc0 spring cleaning 2013-04-20 18:07:19 +03:00
Oleg Semyonov
cb068f507b Merge remote-tracking branch 'origin/next' into amorale/OP-886_sanitychecks 2013-04-19 23:43:42 +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
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
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
sambas
ab8ab4bcc6 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-15 17:41:06 +03: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
6989468d17 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
	.gitignore
2013-04-14 10:13:51 +03:00
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
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
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
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
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
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
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
Brian Webb
4778a12070 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-01 14:30:46 +01:00