aboutsummaryrefslogtreecommitdiff
path: root/makefiles
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Merge remote-tracking branch 'upstream/master' into navigator_newThomas Gubler2014-01-175-199/+3
| | |\ \ \
| * | \ \ \ Merge branch 'master' into navigator_new_vectorAnton Babushkin2014-01-142-0/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'navigator_new' into navigator_new_vectorAnton Babushkin2014-01-132-7/+12
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge remote-tracking branch 'upstream/master' into navigator_newThomas Gubler2014-01-114-0/+57
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'master' into navigator_new_vectorAnton Babushkin2014-01-082-0/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'navigator_new' into navigator_new_vectorAnton Babushkin2014-01-064-23/+8
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'master' of github.com:PX4/Firmware into navigator_newLorenz Meier2014-01-053-23/+5
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into navigator_new_fwThomas Gubler2014-01-011-159/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'launchdetection' into navigator_new_fwThomas Gubler2013-12-294-0/+4
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | initial wip version of launchdetectorThomas Gubler2013-11-152-0/+2
| * | | | | | | | | | | Merge branch 'master' into navigator_new_vector fixAnton Babushkin2014-01-011-158/+0
| * | | | | | | | | | | Use new controllers in logging buildAnton Babushkin2013-12-301-2/+2
| * | | | | | | | | | | Merge branch 'navigator_new' into navigator_new_vector, WIPAnton Babushkin2013-12-284-0/+4
| |\| | | | | | | | | |
| | * | | | | | | | | | add dataman to config_px4fmu-v2_logging.mkThomas Gubler2013-12-231-0/+1
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/control_groups' into fw_autoland_att_t...Thomas Gubler2013-12-232-0/+158
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navi...Thomas Gubler2013-12-133-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Navigator: only whitespace fixesJulian Oes2013-11-182-2/+2
| | * | | | | | | | | | | | Makefiles: fix compilation for backsideJulian Oes2013-11-181-0/+1
| | * | | | | | | | | | | | Merge remote-tracking branch 'jean-m-cyr/master' into navigator_wipJulian Oes2013-11-182-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Add data manager module and fence support to navigatorJean Cyr2013-11-032-0/+2
| | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | makefiles and rc scripts fixed to use new attitude and position controllersAnton Babushkin2013-12-262-4/+2
| * | | | | | | | | | | | | Merge branch 'mathlib_new' into vector_control2Anton Babushkin2013-12-251-0/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mathlib_newAnton Babushkin2013-12-231-0/+157
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | New mathlib, WIPAnton Babushkin2013-12-181-0/+50
| * | | | | | | | | | | | | | Merge branch 'mathlib_new' into vector_control2Anton Babushkin2013-12-251-0/+157
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into vector_control2Anton Babushkin2013-12-161-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into vector_control2Anton Babushkin2013-12-133-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into vector_controlAnton Babushkin2013-11-161-0/+160
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Add mc_att_control_vector to apps listAnton Babushkin2013-11-082-0/+2
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' into paul_estimatorLorenz Meier2014-02-111-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merged origin/master into pubsub_cleanupLorenz Meier2014-02-095-200/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Build the sensors as part of the test binaryLorenz Meier2014-01-142-0/+12
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' into paul_estimatorLorenz Meier2014-02-051-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | mkblctrl fmuv2 support addedmarco2014-02-021-0/+2
* | | | | | | | | | | | | | merge masterLorenz Meier2014-01-314-51/+4
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merged master into loggingLorenz Meier2014-01-203-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into autostart_cleanupAnton Babushkin2014-01-142-0/+2
| | |\| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into autostart_cleanupAnton Babushkin2014-01-102-0/+55
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | * | | | | | | | | | | hw_ver app added for hardware version checkingAnton Babushkin2014-01-074-0/+4
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Remove outdated configs, clean up pwm limit compilationLorenz Meier2014-01-152-194/+0
| * | | | | | | | | | | Disabling EEPROM and old RAMTRON driverLorenz Meier2014-01-144-5/+3
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into paul_estimatorLorenz Meier2014-01-122-0/+2
|\| | | | | | | | | |
| * | | | | | | | | | Added mtd toolLorenz Meier2014-01-112-0/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into paul_estimatorLorenz Meier2014-01-124-0/+57
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into mount_testsLorenz Meier2014-01-073-21/+6
| |\| | | | | | | |
| | * | | | | | | | Merge pull request #578 from kroimon/frsky_telemetryLorenz Meier2014-01-052-0/+2
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Merge branch 'master' into frsky_telemetryStefan Rado2014-01-021-157/+0
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | * | | | | | | Merge branch 'master' into frsky_telemetryStefan Rado2013-12-284-3/+164
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | * | | | | | | Add FrSky telemetry application.Stefan Rado2013-11-242-0/+2
| | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Do not require suffixed constantsLorenz Meier2014-01-051-2/+1