aboutsummaryrefslogtreecommitdiff
path: root/makefiles
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into swissfangThomas Gubler2014-10-071-0/+1
|\
| * Merge pull request #1360 from DonLakeFlyer/UnitTestFrameworkLorenz Meier2014-10-051-0/+1
| |\
| | * Upgraded unit test frameworkDon Gagne2014-09-131-0/+1
* | | re-enable MC apps on FMUV1Thomas Gubler2014-09-301-4/+4
* | | Merge remote-tracking branch 'upstream/master' into swissfangThomas Gubler2014-09-301-4/+4
|\| |
| * | Deactivate FrSky telem by defaultLorenz Meier2014-09-301-1/+1
| * | Flash optimizationLorenz Meier2014-09-301-3/+3
* | | Merge remote-tracking branch 'upstream/obcfailsafe' into swissfangThomas Gubler2014-09-302-3/+3
|\| |
| * | Make space on FMUv1Lorenz Meier2014-09-171-3/+0
| |/
| * Added mavlink_ftp unit testDon Gagne2014-09-021-0/+3
* | swissfang: don't build MC apps on FMU1Thomas Gubler2014-09-071-4/+4
* | Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swiss...Lorenz Meier2014-08-261-0/+5
|\ \ | |/ |/|
| * Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paulLorenz Meier2014-08-211-4/+1
| |\
| * \ Merged masterLorenz Meier2014-08-099-19/+189
| |\ \
| * \ \ Merge remote-tracking branch 'px4/paul_estimator_numeric' into test_bottle_dr...Julian Oes2014-03-302-2/+2
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'px4/master' into bottle_dropJulian Oes2014-03-293-1/+8
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'px4/master' into bottle_dropJulian Oes2014-03-076-338/+41
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into ...Julian Oes2013-12-274-3/+165
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'juchlid/bottledrop' into bottle_drop_navigatorJulian Oes2013-11-291-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Added Bottle Drop appJuchli D2013-11-051-0/+5
* | | | | | | | | config_px4fmu-v2_default: include px4flow driver by defaultJulian Oes2014-08-251-0/+1
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Make some space on FMUv1Lorenz Meier2014-08-171-4/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Revert "Remove old TECS implementation - we can really only decently flight-t...Lorenz Meier2014-07-293-0/+3
* | | | | | | Enable UAVCANLorenz Meier2014-07-231-1/+1
* | | | | | | Comment out uavcan due to build breakage, will go back in ASAPLorenz Meier2014-07-221-1/+1
* | | | | | | Merge pull request #1128 from PX4/uavcanLorenz Meier2014-07-224-1/+4
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into uavcanPavel Kirienko2014-07-084-2/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merged master into uavcanLorenz Meier2014-07-066-11/+155
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merged master into uavcanLorenz Meier2014-05-074-5/+7
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed hardcoded include pathPavel Kirienko2014-05-061-0/+1
| * | | | | | | | | | Initial UAVCAN integration. The library compiles successfully, CAN driver app...Pavel Kirienko2014-05-063-1/+3
* | | | | | | | | | | Merged masterLorenz Meier2014-07-156-10/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Board config cleanup for external bus supportLorenz Meier2014-07-081-0/+1
| * | | | | | | | | | | LL40LS driver: Added new driver to the config make filesakdslr2014-07-082-0/+2
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #1145 from DonLakeFlyer/MoreWarningsLorenz Meier2014-07-081-1/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix compiler warningsDon Gagne2014-07-071-1/+5
| * | | | | | | | | | | Merged masterLorenz Meier2014-07-072-1/+1
| |\| | | | | | | | | |
| | * | | | | | | | | | Move a seldomly used module to test configLorenz Meier2014-07-062-1/+1
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * / | | | | | | | | Cleaning up sub modulesLorenz Meier2014-07-071-0/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-06-283-0/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Enable new lookup libLorenz Meier2014-06-283-0/+3
| * | | | | | | | | | Remove old TECS implementation - we can really only decently flight-test and ...Lorenz Meier2014-06-283-3/+0
| * | | | | | | | | | make launch detector more flash efficientLorenz Meier2014-06-011-5/+1
| |/ / / / / / / / /
* / / / / / / / / / Enable matlab bridge in test setupLorenz Meier2014-06-101-0/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into pca8574Lorenz Meier2014-05-297-9/+157
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow any GCC 4.7 subversionLorenz Meier2014-05-231-3/+3
| * | | | | | | | | makefiles: check for correct arm-none-eabi-gcc versionJulian Oes2014-05-221-2/+12
| * | | | | | | | | Fix aerocore configLorenz Meier2014-05-151-1/+1
| * | | | | | | | | Merge branch 'ekf_params' of github.com:PX4/FirmwareLorenz Meier2014-05-152-2/+2
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merged masterLorenz Meier2014-05-074-5/+7
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |