Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-29 | 17 | -25/+84 |
|\ | | | | | | | | | Conflicts: .gitmodules | ||||
| * | Rework HoTT into a proper library, which fixes parallel build breakage | Lorenz Meier | 2014-12-26 | 5 | -16/+53 |
| | | |||||
| * | Added HMC chip select support | Lorenz Meier | 2014-12-26 | 2 | -0/+17 |
| | | |||||
| * | Merged master into indoor branch | Lorenz Meier | 2014-12-26 | 20 | -230/+1324 |
| |\ | |||||
| | * | Merge pull request #1527 from dagar/Werror | Lorenz Meier | 2014-12-25 | 9 | -8/+11 |
| | |\ | | | | | | | | | turn on -Werror and fix resulting errors | ||||
| | | * | turn on -Werror and fix resulting errors | Daniel Agar | 2014-12-22 | 9 | -8/+11 |
| | | | | |||||
| * | | | Merged master | Lorenz Meier | 2014-11-22 | 55 | -346/+1679 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of github.com:PX4/Firmware into indoor | Lorenz Meier | 2014-09-01 | 1 | -21/+19 |
| |\ \ \ \ | |||||
| * | | | | | Start the laser on a port not offending the 2nd MAVLink instance | Lorenz Meier | 2014-08-27 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-25 | 2 | -5/+47 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/lib/uavcan | ||||
| * | | | | | add interrupt latency printout command and mean/variance to interval ↵ | Mark Whitehorn | 2014-12-24 | 1 | -3/+5 |
| | |_|_|/ | |/| | | | | | | | | | | | | | performance counter | ||||
| * | | | | MPU6000: Add regdump command | Grant Morphett | 2014-12-21 | 1 | -2/+42 |
| | | | | | | | | | | | | | | | | | | | | Add mpu6000 regdump command for debugging mpu6000. | ||||
* | | | | | Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcatt | Thomas Gubler | 2014-12-16 | 4 | -15/+23 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: makefiles/config_px4fmu-v2_test.mk | ||||
| * | | | | Merge pull request #1497 from PX4/ll40lsdefaultmax | Lorenz Meier | 2014-12-14 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | ll40ls: max distance according to datasheet | ||||
| | * | | | | ll40ls: max distance according to datasheet | Thomas Gubler | 2014-12-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Datasheet: http://pulsedlight3d.com/pl3d/wp-content/uploads/2014/11/LIDAR-Lite.pdf | ||||
| | * | | | | ll40ls: fix whitespace | Thomas Gubler | 2014-12-13 | 1 | -9/+9 |
| | | | | | | |||||
| * | | | | | ll40ls: write min and max to report | Thomas Gubler | 2014-12-14 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | ll40ls: fix whitespace | Thomas Gubler | 2014-12-14 | 1 | -9/+9 |
| | | | | | | |||||
| * | | | | | trone: write min and max to report | Thomas Gubler | 2014-12-14 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | trone: fix whitespace | Thomas Gubler | 2014-12-14 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | sf0x: write min and max to report | Thomas Gubler | 2014-12-14 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | sf0x: fix whitespace | Thomas Gubler | 2014-12-14 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | mb12xx: write min and max to report | Thomas Gubler | 2014-12-14 | 1 | -0/+2 |
| |/ / / / | |||||
* | | | | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-02 | 1 | -7/+7 |
|\| | | | | |||||
| * | | | | Fix RGB led stop command | Lorenz Meier | 2014-12-01 | 1 | -7/+7 |
| | | | | | |||||
* | | | | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-11-28 | 6 | -200/+1237 |
|\| | | | | |||||
| * | | | | HMC5883: Better status reporting | Lorenz Meier | 2014-11-26 | 1 | -10/+29 |
| | | | | | |||||
| * | | | | Added TeraRanger one sensor | Lorenz Meier | 2014-11-26 | 67 | -656/+2763 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merged PX4Flow driver changes | Lorenz Meier | 2014-11-26 | 32 | -150/+245 |
| | |\ \ \ \ | |||||
| | | * | | | | airspeed: use _retries=2 for I2C retries once initialised | Andrew Tridgell | 2014-11-26 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | airspeed sensors often need to be on longer cables due to having to be outside the prop wash. | ||||
| | | * | | | | px4io: prevent use of uninitialised memory in io_set_arming_state() | Andrew Tridgell | 2014-11-26 | 1 | -36/+38 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the vehicle may not have setup a control_mode. We need to check the return of orb_copy() to ensure we are getting initialised values | ||||
| | | * | | | | px4io: fixed error returns to be negative | Andrew Tridgell | 2014-11-26 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | follow standard conventions | ||||
| | | * | | | | px4io: fixed RC_CONFIG channel limit check | Andrew Tridgell | 2014-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | number of channels is the right test, not number of actuators | ||||
| | * | | | | | Build for ESC bus conditionally | Lorenz Meier | 2014-10-31 | 1 | -0/+7 |
| | | | | | | | |||||
| | * | | | | | removed debug printf, adjusted test routine single read | dominiho | 2014-10-30 | 1 | -4/+4 |
| | | | | | | | |||||
| | * | | | | | replaced optical_flow mavlink message with optical_flow_rad, added ↵ | dominiho | 2014-10-30 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | gyro_temperature, adapted sd2log for px4flow integral frame | ||||
| | * | | | | | Merge branch 'master' of https://github.com/PX4/Firmware into ↵ | dominiho | 2014-10-30 | 4 | -0/+20 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | px4flow_integral_i2c | ||||
| | * | | | | | | scan also 3rd available bus | dominiho | 2014-10-28 | 1 | -1/+11 |
| | | | | | | | | |||||
| | * | | | | | | deleted last PX4FLOW_BUS to enable scan on both buses | dominiho | 2014-10-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Kill last usleep() | Lorenz Meier | 2014-10-28 | 1 | -3/+0 |
| | | | | | | | | |||||
| | * | | | | | | Scan both buses | Lorenz Meier | 2014-10-28 | 1 | -5/+13 |
| | | | | | | | | |||||
| | * | | | | | | More formatting fixes | Lorenz Meier | 2014-10-28 | 1 | -9/+9 |
| | | | | | | | | |||||
| | * | | | | | | More formatting and cast fixes | Lorenz Meier | 2014-10-28 | 1 | -24/+11 |
| | | | | | | | | |||||
| | * | | | | | | Formatting fixes | Lorenz Meier | 2014-10-28 | 1 | -41/+63 |
| | | | | | | | | |||||
| | * | | | | | | Merged master | Lorenz Meier | 2014-10-28 | 1 | -34/+26 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Fixed formatting of flow driver | Lorenz Meier | 2014-10-28 | 1 | -125/+198 |
| | | | | | | | | | |||||
| | * | | | | | | | added px4flow integral frame, adjusted px4flow i2c driver, adjusted ↵ | dominiho | 2014-10-28 | 1 | -306/+293 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | postition_estimator_inav | ||||
| * | | | | | | | | driver for the TeraRangerOne I2C ranger finder | Luis Rodrigues | 2014-07-23 | 2 | -0/+953 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge remote-tracking branch 'upstream/uorbtinymerge' into dev_ros | Thomas Gubler | 2014-11-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/pr/1040' into uorbtinymerge | Thomas Gubler | 2014-11-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mavlink/include/mavlink/v1.0 src/modules/mc_att_control/mc_att_control_main.cpp |