aboutsummaryrefslogtreecommitdiff
path: root/makefiles
Commit message (Collapse)AuthorAgeFilesLines
* mc_att_control_vector renamed to mc_att_controlAnton Babushkin2014-01-192-2/+2
|
* Merge branch 'autostart_cleanup' into navigator_new_vectorAnton Babushkin2014-01-174-0/+150
|\
| * 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
| | | |
* | | | Merge branch 'navigator_new' into navigator_new_vectorAnton Babushkin2014-01-174-199/+1
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into navigator_newThomas Gubler2014-01-175-199/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: makefiles/config_px4fmu-v1_backside.mk src/modules/commander/commander.cpp src/modules/sdlog2/sdlog2.c
| | * | | | 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 navigator_new_vectorAnton Babushkin2014-01-142-0/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Added mtd toolLorenz Meier2014-01-112-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 mount_testsLorenz Meier2014-01-073-21/+6
| | |\|
| | * | Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_testsLorenz Meier2014-01-071-2/+1
| | |\ \
| | | * \ Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_testsLorenz Meier2014-01-051-0/+3
| | | |\ \
| | | * | | Do not require suffixed constantsLorenz Meier2014-01-051-2/+1
| | | | | |
| | * | | | Improved mount testLorenz Meier2014-01-041-0/+4
| | | | | |
| | * | | | Create test config for FMUv1Lorenz Meier2014-01-041-0/+48
| | | |/ / | | |/| |
| | * | | Fixed tests configLorenz Meier2014-01-041-0/+3
| | |/ /
* | | | Merge branch 'master' into navigator_new_vectorAnton Babushkin2014-01-082-0/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #578 from kroimon/frsky_telemetryLorenz Meier2014-01-052-0/+2
| |\ \ \ | | | | | | | | | | Add FrSky telemetry support
| | * \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | This daemon emulates an FrSky sensor hub by periodically sending data packets to an attached FrSky receiver.
* | | | | | 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
| |\| | | |
| | * | | | Do not require suffixed constantsLorenz Meier2014-01-051-2/+1
| | | | | |
| | * | | | Trimming down number of apps to save flash spaceLorenz Meier2014-01-042-21/+4
| | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into navigator_new_fwThomas Gubler2014-01-011-159/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: makefiles/config_px4fmu-v2_logging.mk
| | * | | Removed special logging config to cut down build timesLorenz Meier2013-12-301-157/+0
| | | |/ | | |/|
| * | | Merge branch 'launchdetection' into navigator_new_fwThomas Gubler2013-12-294-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
| | * | | 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 ↵Thomas Gubler2013-12-232-0/+158
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | fw_autoland_att_tecs_navigator_termination_controlgroups Conflicts: src/systemcmds/tests/module.mk src/systemcmds/tests/tests.h
| * | | | Merge remote-tracking branch 'upstream/master' into ↵Thomas Gubler2013-12-133-3/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fw_autoland_att_tecs_navigator_termination_controlgroups Conflicts: src/drivers/px4io/px4io.cpp
| * | | | | 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
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add function to geo.c to determine if global position is inside fence - Add navigator support/commands for maintaining fence coords. - Add data manager module to support persistence fence storage. Can store other data, but only used for fence at this time. - Add unit tests for data manager
* | | | | 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
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Useful bits for high-rate loggingLorenz Meier2013-12-201-0/+157
| |/ / / /
* | | | | Merge branch 'master' into vector_control2Anton Babushkin2013-12-161-0/+1
|\| | | |