Alessio Morale
b603b10be8
LP-72 - Uncrustify
2016-05-25 13:51:38 +02:00
Alessio Morale
65d2046ccd
LP-72 - fix servo definition
2016-05-25 13:51:37 +02:00
Alessio Morale
2e008884f3
LP-72 - Fix bootloader compilation
2016-05-25 13:51:37 +02:00
Alessio Morale
b88cba80ee
LP-72 - HW definition cleanup
2016-05-25 13:51:37 +02:00
Alessio Morale
cbe52f3f51
LP-72 - Enable link LED
2016-05-25 13:51:37 +02:00
Alessio Morale
620a3c0c12
LP-72 - fix and cleanup timer mapping
2016-05-25 13:51:37 +02:00
Cliff Geerdes
0c76379f0a
LP-72 hott exbus DjiGps systemmod comms stacksize
2016-05-25 13:51:37 +02:00
Cliff Geerdes
9450b13fde
LP-72 BL wouldnt build because it didnt know DSM structs
2016-05-25 13:51:36 +02:00
Cliff Geerdes
8e9e3c72b4
LP-72 Remove FlexiIO ports from WS2811LED table
2016-05-25 13:51:36 +02:00
Cliff Geerdes
c142e5fbc4
LP-72 Redo servo-ESC outputs
2016-05-25 13:51:36 +02:00
Cliff Geerdes
38da5fc9a5
LP-72 get board booting PPM doesnt work DSM and ADC need testing
2016-05-25 13:51:36 +02:00
Cliff Geerdes
3115711049
LP-72 DSM PPM Voltage and Current sensors coded but not tested
2016-05-25 13:51:36 +02:00
Cliff Geerdes
c9b2d4d659
LP-72 Get I2CPort working with I2C Aux Mag LP-73
2016-05-25 13:51:36 +02:00
Cliff Geerdes
f230678479
LP-72 handle rcvrport and sbus differences with revo - sparky version of GCS hw tab
2016-05-25 13:51:35 +02:00
Alessio Morale
0c0b04233b
LP-72 initial GCS support needs xml limits and firmware tab board image
2016-05-25 13:51:35 +02:00
Cliff Geerdes
8db5b034a2
LP-72 PPM overlooked setting but PPM is still broken
2016-05-25 13:51:35 +02:00
Cliff Geerdes
8add346167
LP-72 change BOARD TYPE and REVISION different than Revo
2016-05-25 13:51:34 +02:00
Cliff Geerdes
2286dbcdc2
LP-72 get sbus and maybe ppm working on rcvr input
2016-05-25 13:51:34 +02:00
Cliff Geerdes
9bb95e3a84
LP-72 initial sparky2 support needs GCS, 9250 orientation, testing
2016-05-25 13:51:34 +02:00
James Duley
46b4f4ff40
put flight link arguments in a file
...
to avoid going over windows command limit
2016-05-20 21:38:52 +01:00
Vladimir Zidar
e12967e45a
Merge remote-tracking branch 'upstream/next' into LP-291_port_UAVOMSPBridge_from_dRonin
2016-05-15 22:16:47 +02:00
Lalanne Laurent
c3f0d693b5
Merged in alessiomorale/librepilot/amorale/LP-150_slower_attittude_est_cc (pull request #239 )
...
LP-150 slower attittude estimation for CC/CC3D
2016-05-09 12:21:56 +02:00
Alessio Morale
4cbd4ea926
Merged in f5soh/librepilot/LP-233_OneShot42 (pull request #236 )
...
LP-233 Support OneShot42
2016-05-09 10:53:12 +02:00
Alessio Morale
e14e5febe2
LP-150 - prevent stab error conditions
2016-05-03 01:00:28 +02:00
Alessio Morale
6bd6ef5be1
LP-150 - Run attitude estimation at a configurable fraction of gyro sample rate for CC/CC3D
2016-05-03 01:00:06 +02:00
Laurent Lalanne
214ae849a2
LP-233 Add MultiShot 5 - 25µs pulses
2016-05-02 20:24:03 +02:00
Laurent Lalanne
32a6de6b79
LP-233 Support OneShot42
2016-05-02 20:24:03 +02:00
Laurent Lalanne
c9fff7e16e
LP-151 OPLink: Allow custom Device ID or auto generated.
2016-05-01 21:56:50 +02:00
Vladimir Zidar
f04d44de30
LP-291 Added MSP support to all boards (revolution, revonano, revoproto, discoveryf4bare and coptercontrol)
2016-04-22 03:30:38 +02:00
Vladimir Zidar
1e32ccb1d0
LP-291 Initial port
2016-04-22 03:26:41 +02:00
Laurent Lalanne
6735314852
Uncrustify all
2016-03-12 17:30:24 +01:00
Alessio Morale
ffdd62721f
LP-238 - Move CPP stuffs within apps/boot-defs.mk. fix targets accordingly
2016-02-20 09:57:02 +01:00
Alessio Morale
089c224514
Merged in alessiomorale/librepilot/amorale/LP-96_cpu_idle_counter (pull request #37 )
...
LP-96 Updated CPU idle counter / LP-97 unify CopterControl and Revolution init process
2016-02-19 20:19:05 +01:00
Philippe Renon
f140dd4109
Merged in mindnever/librepilot/debugconsole_fix (pull request #171 )
...
This commit fixes debug console rx_buffer assertion.
2016-02-19 14:09:03 +01:00
Cliff Geerdes
baeb379a82
LP-212 changes from code review
2016-02-16 15:34:59 -05:00
Cliff Geerdes
2ae1f9c63d
LP-212 DJI GPSMag support
2016-02-16 15:23:36 -05:00
Lalanne Laurent
2527cba04f
Merged in f5soh/librepilot/LP-221_Revo_sys_stack_size (pull request #167 )
...
LP-221 Update Revo system stack size same as RevoNano
2016-02-12 07:13:01 +01:00
Vladimir Zidar
b1aa5c1c59
Uncrustified
2016-02-03 23:13:19 +01:00
Vladimir Zidar
eff5ab377e
This commit fixes debug console rx_buffer assertion. Debug console is tx only, but PIOS_Board_configure_com() was not pepared to handle such case.
...
Additionally, debug console on flexi port was incorrectly using pios_usart_main_cfg.
2016-02-02 23:14:09 +01:00
Laurent Lalanne
09818d0603
LP-221 Update Revo system stack size same as RevoNano
2016-01-27 14:13:26 +01:00
Fredrik Arvidsson
e17d809120
Merge branch 'next' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support
2016-01-24 21:11:35 +01:00
Laurent Lalanne
f8f6e454f6
LP-219 Allow up to 12 channel as PPM input, only first 8 channels still used with Oplink.
2016-01-23 16:09:08 +01:00
Fredrik Arvidsson
0d660d33ad
LP-104 LP-196 Changes to address review comments and then uncrustification.
2016-01-16 12:19:34 +01:00
Fredrik Arvidsson
c06fb0249f
LP-104 LP-196 Uncrustify and some other formatting issues fixed.
2016-01-10 10:12:54 +01:00
Fredrik Arvidsson
d32cc0e7fb
Merge branch 'thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support
2016-01-09 19:18:48 +01:00
Fredrik Arvidsson
02c981388a
Merge branch 'thread/LP-196_Jeti_Ex_Bus_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09
...
# Conflicts:
# flight/targets/boards/coptercontrol/board_hw_defs.c
# flight/targets/boards/coptercontrol/firmware/pios_board.c
# flight/targets/boards/revolution/board_hw_defs.c
# flight/targets/boards/revolution/firmware/inc/pios_config.h
# flight/targets/boards/revolution/firmware/pios_board.c
# flight/targets/boards/revonano/firmware/inc/pios_config.h
# flight/targets/boards/revonano/firmware/pios_board.c
# shared/uavobjectdefinition/hwsettings.xml
# shared/uavobjectdefinition/manualcontrolsettings.xml
# shared/uavobjectdefinition/receiveractivity.xml
2016-01-09 16:59:24 +01:00
Fredrik Arvidsson
c48c46b8ef
LP-196 Cleaned up some configuration. Ex.Bus only available on Flexiport.
2016-01-09 16:07:13 +01:00
Fredrik Arvidsson
6a3a822c87
LP-104 Cleaned up configuration. Only Allow HoTT on flexi port.
2016-01-09 15:50:52 +01:00
Fredrik Arvidsson
359266ab7a
LP-104 Removed support for HoTT on Main port on coptercontrol target since it does not work.
2016-01-07 13:01:46 +01:00
Fredrik Arvidsson
08237a1ff5
LP-196 Removed EX.Bus on Main port for CopterControl target since it is not working.
2016-01-06 17:17:02 +01:00
unknown
d00c169dbb
LP-196 Fixed bug in Ex.Bus decoder and changed baud rate for UART to 125 kbaud.
2016-01-03 18:27:14 +01:00
Fredrik Arvidsson
4b8582a3ad
LP-196 Added support for targets Revolution and RevoNano.
2015-12-26 13:08:07 +01:00
Fredrik Arvidsson
3e920bc5bc
LP-196 Added driver for Jeti EX.Bus protocol. Added support for CopterControl target on Main and Flexi port. This is WIP and not tested yet.
2015-12-26 12:29:04 +01:00
Fredrik Arvidsson
879c8fc9b9
LP-104 Correction of @author tag when multiple authors are present.
2015-12-22 18:00:49 +01:00
Fredrik Arvidsson
3d56c4f384
LP-104 Updated copyright headers with LibrePilot
2015-12-22 09:23:57 +01:00
Fredrik Arvidsson
68ff383637
LP-104 Adding HoTT support for Revolution and Revo Nano.
2015-12-20 23:45:37 +01:00
Fredrik Arvidsson
5273df263c
LP-104 Reverted stack size for receiver module after testing.
2015-12-20 21:11:15 +01:00
Fredrik Arvidsson
7a95050381
LP-104 Added missing code to receiver.c to detect receiver activity. This probably caused a crash on any activity of the HoTT receiver.
...
Added 40 bytes to the receiver stack.
Added options to receiver activity.xml uavo definition.
2015-12-20 13:36:45 +01:00
Fredrik Arvidsson
e6d4638201
LP-104 Adds support for Graupner HoTT SUMD/SUMH serial protocol used by receivers on Main and Flexi port.
...
Still work in progress. Only supports CopterControl target and crashes on input :(
2015-12-20 11:08:15 +01:00
Alessio Morale
70faa04b0a
LP-97 - Move board init function declarations to a pios_board_init.h, fix some headers
2015-11-08 18:47:31 +01:00
Cliff Geerdes
e0a805518f
LP-73 uncrustify
2015-10-25 23:59:52 -04:00
Cliff Geerdes
d5bdc41fb9
LP-73 finish the merge with next
2015-10-24 13:14:52 -04:00
Cliff Geerdes
04e3bbd4ce
LP-73 fix fw_osd build poke wdg in startup
2015-10-24 12:23:13 -04:00
Cliff Geerdes
7de55812dd
LP-73 changes for pull request comments
2015-10-24 12:09:22 -04:00
Cliff Geerdes
a110eeda21
LP-73 Remove changes to CopterControl
2015-10-24 12:09:22 -04:00
Cliff Geerdes
d9b7a0bb00
LP-73 port extmag to all other boards
2015-10-24 12:09:21 -04:00
Cliff Geerdes
b086d1a021
LP-73 ExtMag fix some more watchdog issues
2015-10-24 12:09:20 -04:00
Cliff Geerdes
d4b0d106f8
LP-73 External Mags on I2C initial coding
2015-10-24 12:09:19 -04:00
a*morale
792835c009
Uncrustify
2015-09-05 11:49:43 +02:00
Alessio Morale
970ae3df00
LP-97 - Fixes for Osd and discoveryf4bare
2015-09-03 23:40:37 +02:00
Alessio Morale
b88681c69f
LP-97 - Move the common Init process within the System module (coptercontrol/revolution)
2015-09-03 23:40:24 +02:00
James Duley
e308039206
LP-99 Decouple flight build
...
Moved flight make code into flight/Makefile. This should speed up
rebuilds for GCS and keeps the top level Makefile tidier.
Change-Id: I9d33cb5c223b6a8ed2821435a5d63ecf4b97c6b8
2015-09-02 19:34:58 +12:00
Alessio Morale
538a137bf6
Merged in f5soh/librepilot/laurent/LP-92_Feed_forward_remove (pull request #33 )
...
Laurent/lp 92_feed_forward_remove
2015-08-21 13:35:10 +02:00
Roy Bekken
ad84547637
Update all changed files against GIT log with copyright headers consistency.
2015-08-19 16:15:58 +02:00
Laurent Lalanne
99975bf9b0
LP-92 Reduce Actuator stack size - Increase System stack size for diags
2015-08-14 10:59:53 +02:00
m_thread
9ba63ea124
LP-69 Added SRXL support to CopterControl targets.
2015-07-30 15:30:59 +02:00
Alessio Morale
6a60910e19
LP-05: fix for toplevel makefile changes
2015-07-19 14:07:48 +02:00
Alessio Morale
18bc25aac6
Merge branch 'amorale/LP05-Readd_CC_rebased' of https://github.com/AlessioMorale/LibrePilot into AlessioMorale-amorale/LP05-Readd_CC_rebased
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
2015-07-19 12:59:50 +02:00
paul Jewell
6b6461c8b4
Replaced OPENPILOT_IS_COOL by TOP_LEVEL_MAKEFILE
2015-07-15 08:06:21 +01:00
a*morale
62a585c188
LP-5 - Include missing UAVOs, add removed cc fields into hwsettings
2015-07-15 00:07:50 +02:00
a*morale
dd6c6054e9
Revert "OP-1810 FOC"
...
This reverts commit 92e50c2ead
2015-07-15 00:07:50 +02:00
Alessio Morale
78921235cb
Revert "REVONANO - workaround the issue with usart baud rate rounding changing slightly the Xtal frequency."
...
This reverts commit 1985f19fc0
2015-06-06 11:31:02 +02:00
Alessio Morale
c2f3f24df2
Revert "REVONANO - CHange slightly xtal frequency to workaround wrong baud rate calculation"
...
This reverts commit b492b7e10a
2015-06-06 11:30:48 +02:00
Alessio Morale
b492b7e10a
REVONANO - CHange slightly xtal frequency to workaround wrong baud rate calculation
2015-06-05 19:02:22 +02:00
abeck70
66aeac834b
Merge remote-tracking branch 'origin/steve/OP-1904_Display_current_TxPID_settings_on_OSD' into rel-nano-15.05
2015-06-02 08:22:10 +10:00
Alessio Morale
1985f19fc0
REVONANO - workaround the issue with usart baud rate rounding changing slightly the Xtal frequency.
...
Remove the former sbus rate issue workaround
2015-06-01 19:07:06 +02:00
Steve Evans
d41808ecaf
Merge branch 'rel-nano-15.05' into steve/OP-1904_Display_current_TxPID_settings_on_OSD
2015-05-30 12:14:47 +01:00
samguns
8551048354
REVONANO 1. Sanity check for PWMSync & OneShot while using PWM receiver. 2. Remove CC in hwsettings.xml
2015-05-26 15:01:01 +08:00
Steve Evans
5a9ee46742
OP-1904 Initial commit
2015-05-23 21:55:19 +01:00
abeck70
c0c5cd3d16
OP-1464 uncrustify
2015-05-22 18:36:38 +10:00
m_thread
2ce0d5f378
OP-1837 Added SRXL support to nano.
2015-05-21 09:11:55 +02:00
Steve Evans
c3a55d671f
OP-1849 DTR on FlexIO pin 3
...
Conflicts:
flight/targets/boards/revonano/board_hw_defs.c
2015-05-19 21:35:34 +10:00
Laurent Lalanne
1aceea7532
REVONANO : Enable all Airspeed modules
2015-05-18 23:08:43 +02:00
Alessio Morale
9fa1fe870a
OP-1803 - Add support to RevoNano
2015-05-18 21:36:13 +02:00
Alessio Morale
d521ce6023
REVONANO - Add support for WS2811 led on servo output 1.
...
To free timer1, a unused timer (9) is assigned on the fly to servo out 1 to leave pin mappings unchanged. A better approach should be implemented Later (jira 1035)
2015-05-18 21:30:05 +02:00
Alessio Morale
04c067e8cd
REVONANO - Workaround an approximation bug in SPL UART code.
...
Due to some approximation bug in SPL 100000 gives a prescaler of 29 resulting in (48000000 / 29) / 16 (oversampling) = 103448
99999 gives a nice 30 resulting in exactly 100000.
2015-05-18 21:30:04 +02:00
Alessio Morale
295ca38026
REVONANO - Fix Prescaler settings for APB1 and 2 (48MHz and 96MHz)
2015-05-18 21:30:04 +02:00
Alessio Morale
8cb9f8b802
REVONANO - Enable some other modules (battery, airspeed, CameraStab) for testing
2015-05-18 21:30:04 +02:00
Alessio Morale
3fd75273f5
Cleanup/uncrustify
2015-05-18 21:30:04 +02:00
abeck70
c0618258ad
OP-1760 nano statusvtol addition
2015-05-18 21:30:03 +02:00
Alessio Morale
3152ebcaf0
OP-1828 - add support for Revonano
2015-05-18 21:30:03 +02:00
Alessio Morale
2c96835555
REVONANO - Fix System stack size
2015-05-18 21:30:03 +02:00
Alessio Morale
40fa643cca
REVONANO - Cleanup servo pin definitions, map PPM as last channel
2015-05-18 21:30:02 +02:00
Alessio Morale
5ca6e43070
REVONANO - Fix erase settings
2015-05-18 21:30:02 +02:00
Alessio Morale
2497b3d605
REVONANO - some cleanup
2015-05-18 21:30:02 +02:00
Alessio Morale
60f8a8d9f0
REVONANO - Move PPM to input 2 to support oneshot
2015-05-18 21:30:02 +02:00
Alessio Morale
2dcc9e5deb
OP-1659 - Revonano, raise sensor rate to 500Hz
2015-05-18 21:30:01 +02:00
Alessio Morale
54b83085bb
OP-1696 - Revonano cpp support
2015-05-18 21:30:01 +02:00
Alessio Morale
cf09616ba8
OP-1685 - OneShot support for revonano
2015-05-18 21:30:01 +02:00
Alessio Morale
e4dc6b0b64
OP-1658 - baro support for revonano
2015-05-18 21:30:01 +02:00
Alessio Morale
94d30f7ad2
OP-1658 - Add RevoNano support
2015-05-18 21:30:00 +02:00
Alessio Morale
5a140957f9
REVONANO - Update uavos list
2015-05-18 21:30:00 +02:00
Stefan Karlsson
2630383669
REVONANO - Fix the I2C Error IRQ Handler name for the pressure adapter
2015-05-18 21:29:59 +02:00
Stefan Karlsson
a3fc54ac0b
REVONANO - Fix Baro initialization bug
...
The I2C SCLK pin (A8) was being changed by code used to support battery voltage sensing on the Revo. This code was run after PIOS_I2C_Init but before PIOS_MS5611_Init, causing a BUSY state on the I2C bus before the Barometer initialization code was run.
2015-05-18 21:29:59 +02:00
Laurent Lalanne
57845a7cf9
REVONANO - Disable WDG - Add PathPlanner and PathFollower modules - Fix Tx/Rx buffers for GPS
2015-05-18 21:29:59 +02:00
Stefan Karlsson
8f94aa5353
REVONANO - Use Nano as the USB connection name
2015-05-18 21:29:59 +02:00
Stefan Karlsson
7252fb4207
REVONANO - Fix Auto Upload
2015-05-18 21:29:58 +02:00
Laurent Lalanne
aff4951d02
REVONANO Remove hardcoded Flexiport with telemetry
2015-05-18 21:29:58 +02:00
Stefan Karlsson
21b485aa3f
REVONANO - Fix timers for PPM
2015-05-18 21:29:58 +02:00
Stefan Karlsson
047ee1fcb0
REVONANO - Remove relaytuning from revonano target
2015-05-18 21:29:58 +02:00
Alessio Morale
3651ac61a3
REVONANO - Change sensors rate to 333Hz
2015-05-18 21:29:57 +02:00
Alessio Morale
1d7c1b2fc9
REVONANO - Change target to 411, fix ram and flash extents, raise clock to 96MHz (cannot do 100 because of USB) , cleanup spl
2015-05-18 21:29:57 +02:00
Alessio Morale
674963790e
REVONANO - Enable WDG and raise timeout value (due to eeprom reading and initialization being very slow)
2015-05-18 21:29:57 +02:00
Alessio Morale
e5baa8e847
REVONANO - align to 9k setting uniformation
2015-05-18 21:29:57 +02:00
Alessio Morale
15e7286078
MPU9K - merge 9k and 6k settings into a single uavo
2015-05-18 21:29:56 +02:00
Alessio Morale
951c9c2fad
REVONANO - Disable WDG for debug pourposes
2015-05-18 21:29:56 +02:00
Alessio Morale
3563b1ff0e
REVONANO - Prevent modules to start before init: move most code to pios_initcall.h. System and system-Like modules
2015-05-18 21:29:56 +02:00
Stefan Karlsson
efb6855f6f
REVONANO - Various temp fixes debug code to get nano to read from the flash. Code has been added to make the execution of systemTask wait until initTask has completed.
...
Conflicts:
flight/pios/common/pios_flashfs_objlist.c
2015-05-18 21:29:56 +02:00
Stefan Karlsson
2d3c8b835a
REVONANO - Turn on StateEstimate
2015-05-18 21:29:56 +02:00
Stefan Karlsson
8c8abc3cb5
REVONANO - Increase fast_prescaler for the MPU so that it doesn't consume all CPU
2015-05-18 21:29:56 +02:00
Alessio Morale
96659f5757
REVONANO - some unused var cleanup
2015-05-18 21:29:55 +02:00
Alessio Morale
210b75fcb9
REVONANO - Fix MPU Prescalers
2015-05-18 21:29:55 +02:00
Alessio Morale
b6eedaf93d
REVONANO - Fix PIOS_SYSCLK Declaration
2015-05-18 21:29:55 +02:00
Alessio Morale
4a7d81ed01
REVONANO - Fix gyro spi config and include MPU9250 support
2015-05-18 21:29:54 +02:00
Alessio Morale
8a02caa33a
REVONANO - Fix eeprom configuration
2015-05-18 18:55:26 +02:00
Alessio Morale
5c13551a1a
REVONANO - Add support for eeprom and objlist fs
2015-05-18 18:55:25 +02:00
Alessio Morale
764a15999f
REVONANO - Make FlashFS_Logfs optional, remove old onchip eeprom files
...
Conflicts:
flight/targets/boards/coptercontrol/firmware/Makefile
2015-05-18 18:55:21 +02:00
Alessio Morale
8a54414d70
REVONANO - Fix and cleanup hw configurations, Baro working at this stage
2015-05-18 18:54:52 +02:00
Alessio Morale
805750050c
REVONANO - Support distinct remaps for SDA and SCL
2015-05-18 18:54:52 +02:00
Alessio Morale
375f23ff0c
REVONANO - Make debuglog, FlashFS and other bits optional
2015-05-18 18:54:50 +02:00
Alessio Morale
690e04f4f0
REVONANO - Initial board support
2015-05-18 18:52:09 +02:00
Alessio Morale
b59408863a
REVONANO - Allows per board linker scripts
2015-05-18 18:48:17 +02:00
Alex Beck
d6751172ae
OP-1848 altvario fix simposix build
2015-05-14 20:34:32 +10:00
Steve Evans
1771d347bb
Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_flexio_com_bridge
2015-05-13 20:36:06 +01:00
Steve Evans
fd00cd8210
Merge branch 'next' into steve/OP-1803_s.bus_dropped_frames
2015-05-13 20:29:54 +01:00
abeck70
3784357a18
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-13 17:33:11 +10:00
abeck70
92e50c2ead
OP-1810 FOC
...
Squashed commit for clean commit as discussed in code review
Uncrustify
2015-05-13 17:19:51 +10:00
abeck70
2eef3e2dd2
OP-1848 altvario discovery4bare remove second instance of uavo
2015-05-09 14:54:40 +10:00
abeck70
ddefd11b7f
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-07 11:28:24 +10:00
abeck70
143f09d216
Merge remote-tracking branch 'origin/rel-15.02.02' into next
...
Conflicts:
flight/modules/Actuator/actuator.c
2015-05-06 08:35:21 +10:00
