Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into ros | Thomas Gubler | 2015-01-15 | 2 | -27/+4 |
|\ | | | | | | | | | Conflicts: src/platforms/px4_middleware.h | ||||
| * | mavlink app: Be less chatty on startup | Lorenz Meier | 2015-01-09 | 2 | -27/+4 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2015-01-05 | 7 | -16/+280 |
|\| | | | | | | | | | | | | | | | Conflicts: src/lib/mathlib/math/Matrix.hpp src/modules/mc_att_control/mc_att_control_main.cpp src/modules/uORB/topics/vehicle_status.h src/platforms/px4_includes.h | ||||
| * | Merge branch 'master' into sd_full | Lorenz Meier | 2015-01-04 | 2 | -11/+16 |
| |\ | |||||
| | * | Fix offset calculation. | M.H.Kabir | 2015-01-04 | 1 | -6/+5 |
| | | | |||||
| | * | Add suffixes, constant | M.H.Kabir | 2015-01-04 | 2 | -6/+12 |
| | | | |||||
| | * | missing zero | M.H.Kabir | 2015-01-04 | 1 | -1/+1 |
| | | | |||||
| * | | mavlink app: Abort writing to text log on microSD once SD is not writeabele ↵ | Lorenz Meier | 2015-01-04 | 1 | -4/+21 |
| |/ | | | | | | | any more after 5 tries. Fix to first message write. | ||||
| * | mavlink: reduce verbosity | Lorenz Meier | 2015-01-04 | 1 | -9/+9 |
| | | |||||
| * | Merge branch 'gps_utc' of github.com:bansiesta/Firmware | Lorenz Meier | 2015-01-04 | 1 | -4/+4 |
| |\ | |||||
| | * | renaming of gps time to UTC time | Ban Siesta | 2015-01-04 | 1 | -4/+4 |
| | | | |||||
| * | | Fix integer constants in mavlink app | Lorenz Meier | 2015-01-04 | 1 | -4/+4 |
| | | | |||||
| * | | Merge pull request #1505 from mhkabir/timesync | Lorenz Meier | 2015-01-04 | 4 | -2/+189 |
| |\ \ | | |/ | |/| | Timesync | ||||
| | * | Add use example | M.H.Kabir | 2014-12-17 | 1 | -1/+1 |
| | | | |||||
| | * | Restore EMA. Works better for low rates | M.H.Kabir | 2014-12-17 | 2 | -2/+20 |
| | | | |||||
| | * | removed exponential filter. simple weighted average works fine. | M.H.Kabir | 2014-12-16 | 2 | -21/+4 |
| | | | |||||
| | * | minor fix | M.H.Kabir | 2014-12-16 | 1 | -1/+3 |
| | | | |||||
| | * | Fix formatting | M.H.Kabir | 2014-12-16 | 2 | -424/+513 |
| | | | |||||
| | * | Merge remote-tracking branch 'upstream/master' into timesync | M.H.Kabir | 2014-12-16 | 1 | -2/+13 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/modules/mavlink/mavlink_messages.cpp | ||||
| | * | | Working now. | M.H.Kabir | 2014-12-16 | 2 | -8/+10 |
| | | | | |||||
| | * | | New timesync interface import. Not working yet. | M.H.Kabir | 2014-12-15 | 4 | -515/+608 |
| | | | | |||||
| * | | | Merge pull request #1543 from thomasgubler/rcparamtune | Lorenz Meier | 2015-01-01 | 2 | -1/+45 |
| |\ \ \ | | | | | | | | | | | RC param tune | ||||
| | * | | | -Wno-attributes -Wno-packed for mavlink | Thomas Gubler | 2014-12-28 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | rc2param: min and max values | Thomas Gubler | 2014-12-28 | 1 | -0/+2 |
| | | | | | |||||
| | * | | | prototype for changing params by rc | Thomas Gubler | 2014-12-28 | 2 | -1/+43 |
| | | | | | |||||
| * | | | | mavlink tests module: -Wno-attributes -Wno-packed | Thomas Gubler | 2014-12-31 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced in ca97d0156c07ad6cc09e4623140a7f47214946f5 / pull 1542 for the mavlink module | ||||
| * | | | | Merge remote-tracking branch 'upstream/master' into flow_orient | M.H.Kabir | 2014-12-30 | 1 | -1/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/drivers/px4flow/px4flow.cpp | ||||
| * | | | | | fix Z rotation | M.H.Kabir | 2014-12-27 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Add rotation switching to flow from mavlink | M.H.Kabir | 2014-12-27 | 1 | -0/+7 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-29 | 5 | -5/+14 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: .gitmodules | ||||
| * | | | | -Wno-attributes -Wno-packed for mavlink | Thomas Gubler | 2014-12-28 | 1 | -1/+3 |
| |/ / / | |||||
| * | | | fix timestamp | M.H.Kabir | 2014-12-27 | 1 | -0/+1 |
| | | | | |||||
| * | | | mavlink: Removed warnx that references a deleted pointer and causes a hardfault. | Stephan Brown | 2014-12-27 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge pull request #1536 from mhkabir/onboard | Lorenz Meier | 2014-12-26 | 1 | -0/+4 |
| |\ \ \ | | | | | | | | | | | Add streams to onboard mode | ||||
| | * | | | Add streams to onboard mode | Mohammed Kabir | 2014-12-26 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Merge pull request #1527 from dagar/Werror | Lorenz Meier | 2014-12-25 | 4 | -3/+6 |
| |\ \ \ \ | | |/ / / | |/| | | | turn on -Werror and fix resulting errors | ||||
| | * | | | turn on -Werror and fix resulting errors | Daniel Agar | 2014-12-22 | 4 | -3/+6 |
| | | |/ | | |/| | |||||
* | | | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-25 | 1 | -4/+7 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/lib/uavcan | ||||
| * | | | navigator: report using mission result if a DO_JUMP waypoint has been changed | Ban Siesta | 2014-12-19 | 1 | -1/+7 |
| | | | | |||||
| * | | | mavlink: don't slow mission updates down like this, otherwise we might miss ↵ | Ban Siesta | 2014-12-19 | 1 | -3/+0 |
| |/ / | | | | | | | | | | mission results | ||||
* | | | Merge remote-tracking branch 'upstream/master' into dev_ros | Thomas Gubler | 2014-12-18 | 1 | -1/+12 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -10/+3 |
| |\| | |||||
| * | | added VTOL geometries to determine number of motors | Roman Bapst | 2014-12-02 | 1 | -1/+12 |
| | | | |||||
* | | | Merge commit 'aa40c69853be0dc7e79bc3084472b77f9667c1f1' into dev_ros_mcatt | Thomas Gubler | 2014-12-16 | 1 | -10/+3 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: makefiles/config_px4fmu-v2_test.mk | ||||
| * | | mavlink: distance sensor: fix max value | Thomas Gubler | 2014-12-13 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #1391 from PX4/vfr_fix | Lorenz Meier | 2014-12-06 | 1 | -9/+2 |
| |\ \ | | |/ | |/| | mavlink: use altitude AMSL in VFR message | ||||
| | * | Merge branch 'master' into vfr_fix | Anton Babushkin | 2014-11-08 | 3 | -9/+39 |
| | |\ | |||||
| | * | | mavlink: use altitude AMSL in VFR message | Anton Babushkin | 2014-10-16 | 1 | -9/+2 |
| | | | | |||||
* | | | | move vehicle_attitude_setpoint to msg format | Thomas Gubler | 2014-12-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merged PX4Flow driver changes | Lorenz Meier | 2014-11-26 | 5 | -25/+79 |
|\ \ \ |