Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-29 | 2 | -0/+2 |
|\ | | | | | | | | | Conflicts: .gitmodules | ||||
| * | Rework HoTT into a proper library, which fixes parallel build breakage | Lorenz Meier | 2014-12-26 | 1 | -0/+1 |
| | | |||||
| * | turn on -Werror and fix resulting errors | Daniel Agar | 2014-12-22 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-25 | 2 | -0/+15 |
|\| | | | | | | | | | | | Conflicts: .gitignore src/lib/uavcan | ||||
| * | Added aerocore upload target. | James Goppert | 2014-12-18 | 2 | -0/+15 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-18 | 1 | -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_merge | tumbili | 2014-12-15 | 1 | -4/+13 |
| |\ | |||||
| * | | added vtol attitude control module to FMU makefile | tumbili | 2014-12-03 | 1 | -0/+1 |
| | | | |||||
* | | | Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcatt | Thomas Gubler | 2014-12-16 | 1 | -3/+13 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: makefiles/config_px4fmu-v2_test.mk | ||||
| * | | Enable examples by default to ensure they get maintained on API changes | Lorenz Meier | 2014-12-12 | 1 | -4/+13 |
| |/ | |||||
* | | add nuttx platform to fmuv1 makefile | Thomas Gubler | 2014-12-16 | 1 | -0/+1 |
| | | |||||
* | | lots' of header juggling and small changes to make mc att control compile ↵ | Thomas Gubler | 2014-12-16 | 1 | -2/+2 |
| | | | | | | | | for NuttX and ROS | ||||
* | | add nuttx platform to default makefile | Thomas Gubler | 2014-12-10 | 1 | -0/+1 |
| | | |||||
* | | solve conflict for definiton of FILE | Thomas Gubler | 2014-12-06 | 1 | -1/+1 |
| | | |||||
* | | make param wrapper macros compatible for px4 and ros, needs cleanup | Thomas Gubler | 2014-12-03 | 1 | -2/+4 |
| | | |||||
* | | enable systemcmds in test build | Thomas Gubler | 2014-11-28 | 1 | -0/+19 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-11-28 | 2 | -2/+5 |
|\| | |||||
| * | Disable the BlinkM driver, code style fixes for other disabled drivers | Lorenz Meier | 2014-11-27 | 1 | -3/+3 |
| | | |||||
| * | Remove uncommon modules from FMU-v2 build | Lorenz Meier | 2014-11-26 | 1 | -2/+2 |
| | | |||||
| * | Added TeraRanger one sensor | Lorenz Meier | 2014-11-26 | 6 | -30/+45 |
| |\ | |||||
| * | | driver for the TeraRangerOne I2C ranger finder | Luis Rodrigues | 2014-07-23 | 2 | -0/+2 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' into ros | Thomas Gubler | 2014-11-24 | 5 | -20/+27 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: makefiles/config_px4fmu-v2_test.mk | ||||
| * | | Parameter xml metadata in .px4 | Don Gagne | 2014-11-18 | 3 | -0/+15 |
| | | | |||||
| * | | Toolchain: Allow GCC 4.7 and 4.8 variants | Lorenz Meier | 2014-11-17 | 1 | -3/+3 |
| | | | |||||
| * | | Remove unneeded apps from build | Lorenz Meier | 2014-11-15 | 2 | -16/+8 |
| | | | |||||
* | | | Restructuring of generic middleware support files, wrapping of the main ROS ↵ | Lorenz Meier | 2014-11-09 | 1 | -5/+6 |
|/ / | | | | | | | calls, skeletons for publishers / subscribers | ||||
* | | Merge remote-tracking branch 'upstream/master' into swissfang | Thomas Gubler | 2014-10-07 | 1 | -0/+1 |
|\ \ | |||||
| * \ | Merge pull request #1360 from DonLakeFlyer/UnitTestFramework | Lorenz Meier | 2014-10-05 | 1 | -0/+1 |
| |\ \ | | | | | | | | | Upgraded unit test framework | ||||
| | * | | Upgraded unit test framework | Don Gagne | 2014-09-13 | 1 | -0/+1 |
| | | | | |||||
* | | | | re-enable MC apps on FMUV1 | Thomas Gubler | 2014-09-30 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'upstream/master' into swissfang | Thomas Gubler | 2014-09-30 | 1 | -4/+4 |
|\| | | | |||||
| * | | | Deactivate FrSky telem by default | Lorenz Meier | 2014-09-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Flash optimization | Lorenz Meier | 2014-09-30 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang | Thomas Gubler | 2014-09-30 | 2 | -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 FMUv1 | Lorenz Meier | 2014-09-17 | 1 | -3/+0 |
| |/ / | |||||
| * | | Added mavlink_ftp unit test | Don Gagne | 2014-09-02 | 1 | -0/+3 |
| | | | |||||
* | | | swissfang: don't build MC apps on FMU1 | Thomas Gubler | 2014-09-07 | 1 | -4/+4 |
| | | | |||||
* | | | Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into ↵ | Lorenz Meier | 2014-08-26 | 1 | -0/+5 |
|\ \ \ | |/ / |/| | | | | | swissfang | ||||
| * | | Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul | Lorenz Meier | 2014-08-21 | 1 | -4/+1 |
| |\ \ | |||||
| * \ \ | Merged master | Lorenz Meier | 2014-08-09 | 9 | -19/+189 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'px4/paul_estimator_numeric' into ↵ | Julian Oes | 2014-03-30 | 2 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_bottle_drop_paul Conflicts: src/modules/uORB/topics/vehicle_command.h | ||||
| * \ \ \ \ | Merge remote-tracking branch 'px4/master' into bottle_drop | Julian Oes | 2014-03-29 | 3 | -1/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'px4/master' into bottle_drop | Julian Oes | 2014-03-07 | 6 | -338/+41 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ROMFS/px4fmu_common/init.d/rcS | ||||
| * \ \ \ \ \ \ | Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into ↵ | Julian Oes | 2013-12-27 | 4 | -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_navigator | Julian Oes | 2013-11-29 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Added Bottle Drop app | Juchli D | 2013-11-05 | 1 | -0/+5 |
| | | | | | | | | | | |||||
* | | | | | | | | | | config_px4fmu-v2_default: include px4flow driver by default | Julian Oes | 2014-08-25 | 1 | -0/+1 |
| |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
* | | | | | | | | | Make some space on FMUv1 | Lorenz Meier | 2014-08-17 | 1 | -4/+1 |
| |_|_|_|_|_|/ / |/| | | | | | | | |||||
* | | | | | | | | Revert "Remove old TECS implementation - we can really only decently ↵ | Lorenz Meier | 2014-07-29 | 3 | -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 UAVCAN | Lorenz Meier | 2014-07-23 | 1 | -1/+1 |
| | | | | | | |