1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Commit Graph

146 Commits

Author SHA1 Message Date
Alessio Morale
11bc7804d0 Merge branch 'amorale/OP-994_adc_cleanup' into next 2013-07-16 12:23:25 +00:00
Corvus Corax
27eadc200b Merge branch 'corvuscorax/lla2nedfilter' into next
Conflicts:
	flight/modules/StateEstimation/stateestimation.c
2013-07-10 14:38:12 +02:00
Corvus Corax
551780c74b Merge branch 'corvuscorax/complementary_altitude_filter' into next
Conflicts:
	flight/targets/boards/revolution/firmware/UAVObjects.inc
2013-07-10 14:27:25 +02:00
Brian Webb
c2df59498b Merge remote-tracking branch 'origin/master' into next 2013-07-06 07:08:30 -07:00
Alessio Morale
89cb294218 OP-994 Move pios_architecture,h include in pios,h
+review OPReview-506
2013-07-02 19:26:39 +02:00
Corvus Corax
51a4b16af5 New Filter to calculate NED from LLA as part of StateEstimation 2013-06-30 18:49:29 +02:00
Corvus Corax
2a16c0dbd7 removed GPS module ability to calculate NED coordinate (not its job) 2013-06-30 16:31:19 +02:00
Brian Webb
491e5fe685 Adds a failsafe on PPM output on OPLink that kicks in when the link goes down. Also updates all air datarate settings and adds new 64 and 100 kbps modes. 2013-06-29 15:00:38 -07:00
Corvus Corax
7745f93935 changed default coefficients and exposed them to a settings uavobject as they should be 2013-06-29 01:16:02 +02:00
Brian Webb
bab69401b9 OP-932 Allows configuring the Revo as coordinator. 2013-06-27 19:55:01 -07:00
Corvus Corax
cd2cc821d6 made event dispatcher a callback 2013-06-27 18:51:35 +02:00
Brian Webb
2aea2342ab OP-932 Adds a direct PPM channel on each Tx packet when in PPM mode, and adds a PPM only mode that uses a 9600 bps air datarate. Also updates the OPLink configuration tab and moves all OPLink configuration to the OPLink configuration tab on the Revo, and customizes the OPLink configuration tab for the Revo. 2013-06-26 18:01:54 -07:00
Brian Webb
774a74884a OP-932 Replaces the RFM22B PPM/receiver code with an OPLinkReceiver UAVObject. This object is generated on a coordinator OPLink, and is used by both the OPLink to generate PPM output, and the OPLinkReceiver on the Revo. 2013-06-26 17:57:11 -07:00
Brian Webb
8c370df319 OP-932 A significant re-work of the OPLink and configuration of the OPLink. Auto-configuration is removed, and remote modems are bound the coordinator, rather than the other way around. Timing of the radio link is also significantly changed. The rfm22b code is also simplified so that it only sends packet, and has no notion about what those packets are, so the rfm22b is converteded to simply a com type device. 2013-06-26 17:56:56 -07:00
Brian Webb
08efc8d152 OP-932: Adds an oplink receiver device, which is based on the gcs receiver device, but uses the OPLinkReceiver UAVObject. The OPLinkReceiver packets are generated on the OPLink modem. 2013-06-26 17:56:20 -07:00
Corvus Corax
0c43346292 Merge branch 'corvuscorax/OP-947_stateestimator-module' into next
Thanks everyone for helping getting this together, especially Alessio
and DLite :-)
2013-06-25 23:48:12 +02:00
Alessio Morale
0b8d18ae49 OP-994 Move common defines to architecture specific header
+review OPReview-506
2013-06-24 18:50:44 +02:00
Oleg Semyonov
7f84307714 OP-997: fix release notes. This change was reverted but not documented 2013-06-22 18:29:40 +02:00
Alessio Morale
840e6aa4f7 OP-994 Move temp calculation to a macro defined in pios_board.h as it is achitecture dependant
+review OPReview-506
2013-06-15 18:47:33 +02:00
Corvus Corax
1d17d08cca Merge branch 'next' into corvuscorax/OP-947_stateestimator-module 2013-06-12 18:32:01 +02:00
Alessio Morale
2c0f7794a9 Merge remote-tracking branch 'origin/amorale/OP-997_revolution_settings_to_ext_flash' into next 2013-06-11 15:39:13 +02:00
Brian Webb
789930db45 Moved PIOS_TASK_MONITOR_Initialize to before EventDispatcherInitialize. The event dispatcher creates a task that registers itself with the task monitor. It is unlikely that the task will start before the task monitor is initialized, but not impossible (at least on the F4 targets, I don't think). 2013-06-09 20:16:40 -07:00
Alessio Morale
1cb69e6a0e OP-997: Revert Revolution settings storage to external flash to prevent freezes during sector erase/garbage collection 2013-06-09 19:17:12 +02:00
Alessio Morale
bdd80a63c9 OP-994: Refactor/Cleanup of cpu temp measurement: fixed declarations for Voltage Scale constants 2013-06-08 13:46:57 +02:00
Alessio Morale
ab1c9c157f OP-995: Fixes for correct battery monitor readout 2013-06-08 13:40:01 +02:00
Alessio Morale
6671a404ca OP-994 Refactor/Cleanup of cpu temp measurement 2013-06-08 13:36:18 +02:00
Corvus Corax
6fdf554d4a Merge branch 'next' into corvuscorax/OP-947_stateestimator-module
Conflicts:
	flight/modules/Attitude/revolution/attitude.c
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	shared/uavobjectdefinition/attitudesettings.xml
2013-06-06 19:25:54 +02:00
Corvus Corax
9b95af2006 refaktored GPS Sensor UAVObjects 2013-05-22 22:36:23 +02:00
Corvus Corax
b56de3b66b filterchain rework 2013-05-22 21:26:18 +02:00
Brian Webb
ac4847c8ac OP-932 Moves the configuration of the com ports on the coordinator OPLink to startup. 2013-05-21 19:48:21 -07:00
Corvus Corax
ecc4a529a3 some fixes to filtercf and stateestimation and filterekf - Thanks Werner for help :-) 2013-05-21 20:06:33 +02:00
Corvus Corax
3cb4f59c94 failsafe, fallback to attitude for now until StateEstimation works reliably 2013-05-20 20:49:34 +02:00
Corvus Corax
8a36959d39 OP-945: Filter refaktoring - last fixes to make it compile 2013-05-20 17:04:52 +02:00
Corvus Corax
1236bf3ed9 renamed Magneto to Mag 2013-05-20 10:33:02 +02:00
Corvus Corax
49b8e0d699 Merge branch 'next' into corvuscorax/OP-946_refaktor_sensor_and_state 2013-05-20 10:07:55 +02:00
Corvus Corax
d97934cf86 Merge branch 'next' into corvuscorax/OP-946_refaktor_sensor_and_state 2013-05-19 22:05:48 +02:00
Brian Webb
649667d338 Addes ifdef PIOS_INCLUDE_WDG around several calls to the wathdog functions for the Revolution firmware (allows you to turn off the watchdog). 2013-05-19 12:56:23 -07:00
Sexy Pony
900f643bbd Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES 2013-05-19 17:37:30 +03:00
Alessio Morale
ab7af16be3 Merge branch 'amorale/OP-901_lib_udates-usb_fixes' into HEAD
Conflicts:
	flight/pios/stm32f10x/library.mk
	flight/targets/boards/revoproto/firmware/pios_board.c
2013-05-19 15:01:08 +02:00
Corvus Corax
f630351c75 Merge branch 'next' ... 2013-05-19 12:17:40 +02:00
Corvus Corax
daf329d8f5 uncrustification (again) 2013-05-19 11:38:18 +02:00
Alessio Morale
88a39a81d8 Enable ComUsbBridge Optional Module and fix CDC support for RevoProto 2013-05-19 10:07:01 +02:00
Corvus Corax
5284195c29 Refaktored sensor and state UAVObjects consistently into XXYSensor and XXYState 2013-05-18 19:36:45 +02:00
Alessio Morale
c1f767b12d Merge remote-tracking branch 'origin/amorale/OP-954_logfs_settings_in_internal_flash' into next
Conflicts:
	flight/pios/common/pios_flashfs_logfs.c
2013-05-18 15:53:25 +02:00
Alessio Morale
66da2796e0 Merge remote-tracking branch 'origin/amorale/OP-905_revolution_watchdog_next' into next 2013-05-18 15:00:50 +02:00
Corvus Corax
80caceb984 make uncrustify_all;make uncrustify_all; 2013-05-18 14:17:26 +02:00
Alessio Morale
67e41c34fc Merge remote-tracking branch 'origin/next' into amorale/usb_fixes 2013-05-17 22:46:42 +02:00
Richard Flay (Hyper)
a6aedee9fa Merge branch 'next' into brian/support_inverted_USB_vsense 2013-05-17 05:54:42 +09:30
Alessio Morale
6ba15ebc53 OP-954 Fixes from review:
- CopterControl target fix
- tabs in Nakefiles
- Removed duplicate stale settings and clean empty lines in osd Makefile
+review OPReview-470
2013-05-15 23:18:50 +02:00
Alessio Morale
c80f01dff9 OP-954 Rename the legacy PIOS_INCLUDE_FLASH_SECTOR_SETTINGS to PIOS_INCLUDE_FLASH_LOGFS_SETTINGS
+review OPReview-470
2013-05-15 23:16:34 +02:00
Brian Webb
156109bb88 Added support for an active low USB vsense line. 2013-05-14 20:37:13 -07:00
Alessio Morale
742ea6f6b8 Merge branch 'amorale/OP-905_revolution_watchdog' into next
Conflicts:
	flight/targets/RevoMini/System/pios_board.c
2013-05-14 18:42:02 +02:00
Richard Flay (Hyper)
ed68fbe68d OP-951: Adds -Wshadow to flight CFLAGS and fixes resulting compilation breakage.
+review OPReview
2013-05-14 07:01:45 +09:30
Alessio Morale
535b53cb1c Raised priority for USB interrupt to high, changed subriority to 0 (PriorityGroup is 0) 2013-05-11 22:41:05 +02:00
Stacey Sheldon
441e9e7b84 f4 usb: always init HID and CDC devices
This is required so that we can always respond to HID and
CDC requests via the control endpoint (ep0).  The F1/F3
implementation gets away with disabling these interfaces
because all of the ep0 handling is in the usbhook code
rather than (properly) split out into class-specific
drivers like it is done on the F4 implementation.

Conflicts:
	flight/targets/DiscoveryF4/System/pios_board.c
	flight/targets/FlyingF4/System/pios_board.c
	flight/targets/Freedom/System/pios_board.c
	flight/targets/Quanton/System/pios_board.c
2013-05-11 22:41:04 +02:00
Stacey Sheldon
565de5fd4e f4 usb: ensure correct interface numbers for BL and FW
The interface numbers differ for the HID interface between
the BL and FW.  This is required to keep windows happy.

In HID+CDC, the CDC interfaces must come first with HID last
which makes it #2.  In HID only mode, we can't use #2 for HID
since windows doesn't like the first/only interface to be
anything other than #0.

Conflicts:
	flight/targets/board_hw_defs/discoveryf4/board_hw_defs.c
	flight/targets/board_hw_defs/flyingf4/board_hw_defs.c
	flight/targets/board_hw_defs/freedom/board_hw_defs.c
	flight/targets/board_hw_defs/quanton/board_hw_defs.c
2013-05-11 22:41:02 +02:00
Stacey Sheldon
9cc70695d7 f4 usb cdc: add support for USB CDC to RevoMini
Conflicts:
	flight/targets/RevoMini/System/inc/pios_config.h
	flight/targets/RevoMini/System/pios_board.c
2013-05-11 22:40:56 +02:00
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
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
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
Brian Webb
c3ea1bf3c0 OP-932: Fixed GPIO debugging on RevoMini (both V1 and V2) 2013-05-01 03:13:36 +01: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
Corvus Corax
6e2c9b3c46 New EKFStateVariance UAVObject with EKF state variance information 2013-04-28 19:38:37 +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
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
66db978244 Rename Libraries->libraries, Modules->modules 2013-04-25 13:13:36 +03:00
Oleg Semyonov
8f784ac6cb flight: remove unnecessary #include "systemmod.h" from boards 2013-04-24 22:35:34 +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
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