Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added flow position estimator to default apps. | James Goppert | 2015-02-11 | 1 | -0/+5 |
| | |||||
* | Merged master into ros | Lorenz Meier | 2015-02-02 | 1 | -6/+6 |
|\ | |||||
| * | FMUv2: Re-enable missing sensors | Lorenz Meier | 2015-02-01 | 1 | -6/+6 |
| | | |||||
| * | Upgrade UAVCAN to multi pub/sub A API | Lorenz Meier | 2015-01-29 | 1 | -1/+1 |
| | | |||||
| * | Disable UAVCAN build until sensors use all new-style API and UAVCAN sensors ↵ | Lorenz Meier | 2015-01-29 | 1 | -1/+1 |
| | | | | | | | | base class can be reworked to use it consistently | ||||
| * | Updated NuttX submodule with memcpy fix, disabled run time stack checking ↵ | David Sidrane | 2015-01-29 | 1 | -5/+5 |
| | | | | | | | | and added modules back in | ||||
* | | remove unintended/leftover changes in fmu2 default makefile | Thomas Gubler | 2015-02-01 | 1 | -2/+2 |
| | | |||||
* | | Revert "temporarily re-enable stack checking, disable some modules to make ↵ | Thomas Gubler | 2015-01-28 | 1 | -5/+5 |
| | | | | | | | | | | | | firmware fit" This reverts commit 27b2701340648e2fde1992b175abfa591e0eee01. | ||||
* | | Merge remote-tracking branch 'upstream/master' into ↵ | Thomas Gubler | 2015-01-28 | 1 | -5/+5 |
|\| | | | | | | | ros_messagelayer_merge_attctlposctl | ||||
| * | temporarily re-enable stack checking, disable some modules to make firmware fit | Thomas Gubler | 2015-01-28 | 1 | -5/+5 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/ros' into ros_messagelayer_merge | Thomas Gubler | 2015-01-21 | 1 | -2/+2 |
|\ \ | |||||
| * | | DELETE DURING REBASE: Remove some apps to make space | Lorenz Meier | 2015-01-21 | 1 | -2/+2 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' into ros_messagelayer_merge | Thomas Gubler | 2015-01-21 | 1 | -0/+1 |
|\ \ \ | |/ / |/| / | |/ | | | | | Conflicts: src/modules/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp src/modules/uORB/topics/vehicle_attitude.h | ||||
| * | Astyle: Run astyle to fix code formatting | Johan Jansen | 2015-01-15 | 1 | -1/+1 |
| | | |||||
| * | LandDetector: Merged fixedwing and multicopter into one module handling both ↵ | Johan Jansen | 2015-01-15 | 1 | -6/+1 |
| | | | | | | | | algorithms | ||||
| * | LandDetector: Added crude land detectors for multicopter and fixedwing | Johan Jansen | 2015-01-15 | 1 | -0/+6 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into ros | Thomas Gubler | 2015-01-09 | 1 | -3/+3 |
|\| | |||||
| * | Temporarily disable HoTT support | Lorenz Meier | 2015-01-09 | 1 | -3/+3 |
| | | |||||
* | | add multiplatform makefile to work around flash size issues | Thomas Gubler | 2015-01-06 | 1 | -3/+2 |
| | | |||||
* | | Revert "uavcan gives compile errors, disable for now" | Thomas Gubler | 2015-01-05 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 941ff05720b4ba8c282a84e1f8933469ae7fc39e. | ||||
* | | mc att control multiplatform alongside normal mc att control | Thomas Gubler | 2015-01-05 | 1 | -0/+1 |
| | | |||||
* | | uavcan gives compile errors, disable for now | Thomas Gubler | 2015-01-05 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-29 | 1 | -0/+1 |
|\| | | | | | | | | | Conflicts: .gitmodules | ||||
| * | Rework HoTT into a proper library, which fixes parallel build breakage | Lorenz Meier | 2014-12-26 | 1 | -0/+1 |
| | | |||||
* | | 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 | ||||
| * | added vtol attitude control module to FMU makefile | tumbili | 2014-12-03 | 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 |
|/ | |||||
* | 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 | 1 | -16/+11 |
|\ | |||||
| * | Parameter xml metadata in .px4 | Don Gagne | 2014-11-18 | 1 | -0/+3 |
| | | |||||
| * | Remove unneeded apps from build | Lorenz Meier | 2014-11-15 | 1 | -16/+1 |
| | | |||||
| * | Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into ↵ | Lorenz Meier | 2014-08-26 | 1 | -0/+5 |
| |\ | | | | | | | | | | swissfang | ||||
| | * | Merged master | Lorenz Meier | 2014-08-09 | 1 | -3/+6 |
| | |\ | |||||
| | * \ | Merge remote-tracking branch 'px4/paul_estimator_numeric' into ↵ | Julian Oes | 2014-03-30 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+3 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'px4/master' into bottle_drop | Julian Oes | 2014-03-07 | 1 | -3/+8 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ROMFS/px4fmu_common/init.d/rcS | ||||
| | * \ \ \ \ | Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into ↵ | Julian Oes | 2013-12-27 | 1 | -1/+3 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Revert "Remove old TECS implementation - we can really only decently ↵ | Lorenz Meier | 2014-07-29 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | | | | | | | driver for the TeraRangerOne I2C ranger finder | Luis Rodrigues | 2014-07-23 | 1 | -0/+1 |
|/ / / / / / / | |||||
* | | | | | | | Enable UAVCAN | Lorenz Meier | 2014-07-23 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Comment out uavcan due to build breakage, will go back in ASAP | Lorenz Meier | 2014-07-22 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1128 from PX4/uavcan | Lorenz Meier | 2014-07-22 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Basic UAVCAN support | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into uavcan | Pavel Kirienko | 2014-07-08 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merged master into uavcan | Lorenz Meier | 2014-07-06 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merged master into uavcan | Lorenz Meier | 2014-05-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ |