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

728 Commits

Author SHA1 Message Date
Alessio Morale
ce87ce105e LP-443 - Add INS14 to Sparky/Revo 2017-01-07 18:14:28 +01:00
Alessio Morale
e39a5a92bc LP-437 - Support for Sparky2 2017-01-06 16:02:28 +01:00
Alessio Morale
14080021b2 LP-437 - Support for Revolution 2017-01-06 16:02:28 +01:00
Alessio Morale
0af373a8c7 LP-437 - Support for OPLinkMini 2017-01-06 16:02:28 +01:00
Vladimir Zidar
fef715b3d6 LP-463 Use correct timer clock for F1 target. All timers get 72M clock regardless of APB domain they live on. 2017-01-01 17:17:58 +01:00
Lalanne Laurent
c2cf44f8d8 Merged in mindnever/librepilot/LP-415_pios_servo_Add_functions_to_support_esc_passthrough (pull request #334)
LP-415 pios servo add functions to support esc passthrough
2016-12-28 14:20:28 +01:00
Vladimir Zidar
85df731afc LP-415 Added LP copyright to modified files 2016-12-28 13:25:50 +01:00
Vladimir Zidar
dad4a94036 LP-415 Consolidate F1 & F4 version into single one that lives in pios/common/ 2016-12-28 13:25:50 +01:00
Laurent Lalanne
2872a3467a LP-345 Simplify xtalcap callback check, reuse PIOS_RFM22B_SetXtalCap at boot 2016-12-23 14:39:09 +01:00
Laurent Lalanne
340d304558 LP-345 Changes from review - Typos - Initialize previousOPLinkSettings 2016-12-23 14:39:09 +01:00
Laurent Lalanne
ea377973fc LP-346 RFM22 tuning: Add XtalCap value for fine tuning 2016-12-23 14:39:08 +01:00
Laurent Lalanne
f332d48e9b LP-345 RFM22: Add frequency band selection. 433, 868 and 915Mhz band 2016-12-23 14:38:50 +01:00
Philippe Renon
33188bd78e Merge remote-tracking branch 'upstream/master' into next
# Conflicts:
#	ground/gcs/src/plugins/coreplugin/connectionmanager.cpp
2016-12-13 00:56:32 +01:00
Vladimir Zidar
64bf884f96 LP-391 Changed PIOS_COM_Init buffer len parameters to uint16_t type. Fixed simposix pios_board.c GPSPORT_GPS init incorrectly passing -1 to PIOS_Board_configure_com() which was on some platforms converted to large unsigned value. 2016-11-26 21:51:29 +01:00
Lalanne Laurent
553448abad Merged in alessiomorale/librepilot/LP-385_cameracontrol (pull request #309)
Lp 385_cameracontrol
2016-09-21 21:24:05 +02:00
Cliff Geerdes
8cfc867e1d LP-333 I2C Pullups for flexiport and i2cport 2016-09-18 20:27:23 +02:00
Alessio Morale
493a48ba2b LP-385 - fixes from review 2016-09-03 21:44:41 +02:00
Philippe Renon
52a9aa37c8 Merged in mindnever/librepilot/LP-391_fix_Some_CC3D_ports_cause_a_boot_issue_and_re_init_to_defaults (pull request #307)
LP-391 This fixes issue with negative size (-1) passing from PIOS_Board_configure_com() to PIOS_COM_Init().
2016-08-30 09:56:53 +02:00
Vladimir Zidar
107aa2170e LP-391 This fixes issue with negative size (-1) passing from PIOS_Board_configure_com() to PIOS_COM_Init(). 2016-08-30 02:03:10 +02:00
Vladimir Zidar
a5a45576a1 LP-322 Added USB ComBridge functionality to OPLink. Updated GCS code. 2016-08-30 01:52:59 +02:00
Alessio Morale
6c8dafec3c LP-385 - Add support for all revo class boards 2016-08-29 21:16:52 +02:00
Alessio Morale
44f1c76ef9 Merge branch 'next' into LP-385_cameracontrol 2016-08-29 21:04:55 +02:00
Philippe Renon
1647982fca Merged in f5soh/librepilot/LP-387-Sparky_analog_port (pull request #305)
LP-387 Analog port: Add DAC pin as input - Fix pin mapping.
2016-08-28 18:48:22 +02:00
Philippe Renon
45f791742d Merged in mindnever/librepilot/LP-239_GPS_on_Revo_FlexiIO (pull request #299)
LP-239 gps_on_revo_flexiio
2016-08-28 18:46:12 +02:00
Laurent Lalanne
798248ef24 LP-387 Analog port: Add DAC pin as input - Fix pin mapping. 2016-08-21 04:57:15 +02:00
Alessio Morale
88a8e767c4 LP_385 - Implement activation/manual override logic, Camera activity "publishing" 2016-08-18 19:25:55 +02:00
Alessio Morale
c7e060c04a LP-385 - Initial CameraControl module commit 2016-08-18 12:40:34 +02:00
Vladimir Zidar
51151e6290 LP-239 This commit adds missing com protocols (GPS) to Revo Flexi IO (rcvrport) including proper GCS handling 2016-08-06 03:20:35 +02:00
Laurent Lalanne
34f55ffbe2 LP-298 Use PIOS_Board_configure_ibus() for all boards - Missing define for RevoNano 2016-08-05 20:49:34 +02:00
Laurent Lalanne
e52d2636f0 LP-298 Use PIOS_IBUS_NUM_INPUTS like other inputs 2016-08-03 19:52:34 +02:00
Laurent Lalanne
5895468f08 LP-298 Port Ibus Input driver from dRonin - Not tested 2016-08-03 19:09:05 +02:00
Vladimir Zidar
12c6c9b2fe LP-364 Cosmetic changes including (in)famous uncrustify. 2016-07-24 22:26:34 +02:00
Vladimir Zidar
5b8d168a12 LP-364 This commit adds MAVLink to revoproto target 2016-07-24 22:26:34 +02:00
Vladimir Zidar
b0dd2649bc LP-364 remaining conflict fixes 2016-07-24 22:26:34 +02:00
Vladimir Zidar
873950b071 LP-364 Added MAVLink support to remaining target boards: sparky2, revonano and coptercontrol. 2016-07-24 22:26:29 +02:00
Vladimir Zidar
b8b9d31c07 LP-364 Initial MAVLink bridge port from dRonin 2016-07-24 22:21:30 +02:00
Vladimir Zidar
a0e7859dd1 LP-365 replace com port boilerplate code with calls to PIOS_Board_configure_com() 2016-07-21 23:52:23 +02:00
Brian Webb
9fdde98ff9 LP-190: Adds OPLink configuration GUI cleanup from filnet. 2016-07-12 18:01:03 -07:00
Brian Webb
586af77267 LP-190: Fixes an issue with uninitialized OPLink receiver channels. 2016-07-12 17:49:29 -07:00
Brian Webb
02b5a9bd78 LP-190: ppm_mode must be true if either 'control' or 'data and control' are set even if no PPM ports are configured, otherwise the data link doesn't work. 2016-07-12 17:49:26 -07:00
Brian Webb
2e2bb1b20b LP-190: Removed rfm22breceiver UAVO. 2016-07-12 17:49:16 -07:00
Brian Webb
0738c8a78a LP-190: Final testing and bug fixes. 2016-07-12 17:47:16 -07:00
Brian Webb
91ea8966da LP-190: Addes support for OpenLRS receiver protocol to the OPLinkMini. Also updates the OPLink configuration to better support OpenLRS. 2016-07-12 17:47:16 -07:00
Brian Webb
aa21761f4c LP-190: Adds support for OpenLRS protocol to OPLinkMini 2016-07-12 17:47:16 -07:00
Brian Webb
021eb21008 LP-190: Moved openlrsstatus UAVO to OPLinkStatus 2016-07-12 17:46:15 -07:00
Brian Webb
dc17bd9ad8 LP-190: Adds support for OpenLRS receiver to Sparky2 target. 2016-07-12 17:46:15 -07:00
Brian Webb
a0279b272f LP-190: Initial checkin that adds OpenLRS receiver support to Revolution and OPLinkMini. 2016-07-12 17:45:33 -07:00
Cliff Geerdes
ec80904cb2 LP-76 remove a comment from 2 UAVObjects.inc files 2016-06-18 14:15:46 -04:00
Cliff Geerdes
9b6d7b263f LP-76 change (c) to (C) in copyright comments 2016-06-18 14:15:46 -04:00
Cliff Geerdes
039e95ac4f LP-76 fix MSP merge conflict sort OPTMODULES in alphabetical order 2016-06-18 14:14:04 -04:00
Cliff Geerdes
aa06b1793f LP-76 update copyrights 2016-06-18 14:08:05 -04:00
Cliff Geerdes
a217d0015f LP-76 better yaw-calc yaw by default-yaw overrides-cleanup for review 2016-06-18 14:08:04 -04:00
Cliff Geerdes
db07550303 LP-76 smooth to quick slider on accessoryx untested 2016-06-18 14:08:03 -04:00
Cliff Geerdes
2105a49ca9 LP-76 add UAV defaults and remove UAV inits 2016-06-18 14:08:03 -04:00
Philippe Renon
be3be734b5 Merged in f5soh/librepilot/LP-326_16_PPM_Channels_support (pull request #256)
LP-326 16 PPM channels support
2016-06-08 21:59:08 +02:00
Laurent Lalanne
b6ed0d9c9c LP-326 Increase CC3D Receiver stask size 2016-05-31 08:05:12 +02:00
Laurent Lalanne
fc07b26547 LP-326 Support up to 16 PPM channels 2016-05-31 08:04:41 +02:00
Vladimir Zidar
c79f85560d LP-324 Fixed MSP support for Sparky2 target 2016-05-28 23:23:34 +02:00
Cliff Geerdes
c54b88d0f0 LP-72 fixed comments 2016-05-27 17:19:14 +02:00
Laurent Lalanne
e776441c49 LP-72 Fix for receiverPort / Hott 2016-05-26 20:15:57 +02:00
Cliff Geerdes
f5e5ee18bf LP-72 fix MSP on MainPort 2016-05-26 20:01:11 +02:00
Laurent Lalanne
25a95d7ae2 LP-72 Fix for FlexiPort I2C configuration 2016-05-26 06:30:01 +02:00
Cliff Geerdes
32e4354e4b LP-72 fix aux mag orientation so GPSV9 DJI are 0 0 0 2016-05-25 23:22:53 +02:00
Laurent Lalanne
2138516dfe LP-72 Various typo fixes - Set PPM input as default 2016-05-25 13:51:41 +02:00
Cliff Geerdes
fdc8b10ddf LP-72 use TauLabs USB IDs for Sparky2 so users can cross flash LP and TL without SBL. 2016-05-25 13:51:41 +02:00
Cliff Geerdes
0695e6acb2 LP-72 final update of old sparky2 ID that is not TL compatible 2016-05-25 13:51:41 +02:00
Vladimir Zidar
bcea35a8e1 LP-72 Added EX.Bus,HoTT SUMD and HoTT SUMH to RCVRPORT. 2016-05-25 13:51:40 +02:00
Vladimir Zidar
a1a6b130b8 LP-72 Cleaned up SPK2_RcvrPort: removed MSP from hwsettings, added SRXL rcvr port uart definition and initialization. 2016-05-25 13:51:39 +02:00
Cliff Geerdes
c7f450f82e LP-72 move flexi from rm_ to spk2_ port msp wizard and sbus fixes usagetracker 2016-05-25 13:51:39 +02:00
Cliff Geerdes
2e65449dcc LP-72 rename revolution.cpp rename revo defines rename revo comments 2016-05-25 13:51:38 +02:00
Cliff Geerdes
acab5c93f1 LP-72 small or cosmetic for PR - more to come 2016-05-25 13:51:38 +02:00
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