aboutsummaryrefslogtreecommitdiff
path: root/makefiles
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into dev_rosThomas Gubler2014-12-292-0/+2
|\ | | | | | | | | Conflicts: .gitmodules
| * Rework HoTT into a proper library, which fixes parallel build breakageLorenz Meier2014-12-261-0/+1
| |
| * turn on -Werror and fix resulting errorsDaniel Agar2014-12-221-0/+1
| |
* | Merge remote-tracking branch 'upstream/master' into dev_rosThomas Gubler2014-12-252-0/+15
|\| | | | | | | | | | | Conflicts: .gitignore src/lib/uavcan
| * Added aerocore upload target.James Goppert2014-12-182-0/+15
| |
* | Merge remote-tracking branch 'upstream/master' into dev_rosThomas Gubler2014-12-181-0/+1
|\| | | | | | | | | | | | | | | | | Conflicts: src/examples/subscriber/subscriber_params.c src/modules/mc_att_control/mc_att_control_main.cpp src/modules/uORB/topics/vehicle_attitude.h src/modules/uORB/topics/vehicle_attitude_setpoint.h src/platforms/px4_middleware.h
| * Merge branch 'master' of https://github.com/PX4/Firmware into vtol_mergetumbili2014-12-151-4/+13
| |\
| * | added vtol attitude control module to FMU makefiletumbili2014-12-031-0/+1
| | |
* | | Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcattThomas Gubler2014-12-161-3/+13
|\ \ \ | | |/ | |/| | | | | | | Conflicts: makefiles/config_px4fmu-v2_test.mk
| * | Enable examples by default to ensure they get maintained on API changesLorenz Meier2014-12-121-4/+13
| |/
* | add nuttx platform to fmuv1 makefileThomas Gubler2014-12-161-0/+1
| |
* | lots' of header juggling and small changes to make mc att control compile ↵Thomas Gubler2014-12-161-2/+2
| | | | | | | | for NuttX and ROS
* | add nuttx platform to default makefileThomas Gubler2014-12-101-0/+1
| |
* | 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
|\ \ \ | | |/ | |/| | | | | | | Conflicts: makefiles/config_px4fmu-v2_test.mk
| * | 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 ↵Lorenz Meier2014-11-091-5/+6
|/ / | | | | | | calls, skeletons for publishers / subscribers
* | 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 framework
| | * | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/lib/external_lgpl/tecs/tecs.cpp src/modules/commander/commander_params.c src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp src/modules/navigator/navigator_main.cpp
| * | | 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 ↵Lorenz Meier2014-08-261-0/+5
|\ \ \ | |/ / |/| | | | | swissfang
| * | 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 ↵Julian Oes2014-03-302-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_bottle_drop_paul Conflicts: src/modules/uORB/topics/vehicle_command.h
| * \ \ \ \ 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ROMFS/px4fmu_common/init.d/rcS
| * \ \ \ \ \ \ Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into ↵Julian Oes2013-12-274-3/+165
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bottle_drop_navigator Conflicts: src/drivers/px4fmu/fmu.cpp src/modules/dataman/dataman.c src/modules/dataman/dataman.h src/modules/mavlink/orb_listener.c src/modules/mavlink/waypoints.c src/modules/navigator/navigator_main.cpp src/modules/navigator/navigator_mission.cpp src/modules/navigator/navigator_mission.h src/modules/uORB/topics/mission.h
| * \ \ \ \ \ \ \ 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 ↵Lorenz Meier2014-07-293-0/+3
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flight-test and support one." This reverts commit 503ded05394767d58359834e73bc63672b701dbe. Conflicts: mavlink/include/mavlink/v1.0 src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
* | | | | | | Enable UAVCANLorenz Meier2014-07-231-1/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 01:50:48 +0000