aboutsummaryrefslogtreecommitdiff
path: root/makefiles
Commit message (Expand)AuthorAgeFilesLines
* solve conflict for definiton of FILEThomas Gubler2014-12-061-1/+1
* make param wrapper macros compatible for px4 and ros, needs cleanupThomas Gubler2014-12-031-2/+4
* enable systemcmds in test buildThomas Gubler2014-11-281-0/+19
* Merge remote-tracking branch 'upstream/master' into dev_rosThomas Gubler2014-11-282-2/+5
|\
| * Disable the BlinkM driver, code style fixes for other disabled driversLorenz Meier2014-11-271-3/+3
| * Remove uncommon modules from FMU-v2 buildLorenz Meier2014-11-261-2/+2
| * Added TeraRanger one sensorLorenz Meier2014-11-266-30/+45
| |\
| * | driver for the TeraRangerOne I2C ranger finderLuis Rodrigues2014-07-232-0/+2
* | | Merge remote-tracking branch 'upstream/master' into rosThomas Gubler2014-11-245-20/+27
|\ \ \ | | |/ | |/|
| * | Parameter xml metadata in .px4Don Gagne2014-11-183-0/+15
| * | Toolchain: Allow GCC 4.7 and 4.8 variantsLorenz Meier2014-11-171-3/+3
| * | Remove unneeded apps from buildLorenz Meier2014-11-152-16/+8
* | | Restructuring of generic middleware support files, wrapping of the main ROS c...Lorenz Meier2014-11-091-5/+6
|/ /
* | 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
| |\| | | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 08:01:10 +0000