Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
* | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Initial UAVCAN integration. The library compiles successfully, CAN driver ↵ | Pavel Kirienko | 2014-05-06 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | appears to be working properly. There is one hardcoded path in the module makefile that needs to be fixed; plus the compilation will likely fail unless arch/math.h contains log2l() | ||||
* | | | | | | | | | | LL40LS driver: Added new driver to the config make files | akdslr | 2014-07-08 | 1 | -0/+1 |
| |_|_|/ / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Move a seldomly used module to test config | Lorenz Meier | 2014-07-06 | 1 | -1/+0 |
| |_|/ / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into mtecs | Thomas Gubler | 2014-06-28 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Enable new lookup lib | Lorenz Meier | 2014-06-28 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Remove old TECS implementation - we can really only decently flight-test and ↵ | Lorenz Meier | 2014-06-28 | 1 | -1/+0 |
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | support one. | ||||
* | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into pca8574 | Lorenz Meier | 2014-05-29 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merged master | Lorenz Meier | 2014-05-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | ver command ready including hwcmp which replaces hw_ver, removed hw_ver | ufoncz | 2014-04-27 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated all scripts to use new ver hwcmp command q | ||||
| | * | | | | | | | changed dir from version to ver to keep it shorter | ufoncz | 2014-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added "hw_ver compare" as command option so we can replace hw_ver in future | ||||
| | * | | | | | | | added version nsh command, it can replace hw_ver | ufoncz | 2014-04-25 | 1 | -0/+1 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | sss | ||||
| * / / / / / / | Renamed FW filter to EKF to express its generic properties, switched ↵ | Lorenz Meier | 2014-04-19 | 1 | -1/+1 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | multicopters over to this filter for first tests. | ||||
* / / / / / / | Port expander driver first hacky version | Lorenz Meier | 2014-04-29 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Merged beta_mavlink2 / master | Lorenz Meier | 2014-03-16 | 1 | -0/+3 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'master' into beta_mavlink2 | Anton Babushkin | 2014-03-15 | 1 | -0/+3 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of github.com:PX4/Firmware into laser_rangefinder | Lorenz Meier | 2014-03-12 | 1 | -0/+2 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'master' of github.com:PX4/Firmware into gpio_led_fmuv2 | Lorenz Meier | 2014-03-12 | 1 | -0/+1 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | dumpfile command and fetch_log.py tool implemented to fetch logs via nsh ↵ | Anton Babushkin | 2014-03-08 | 1 | -0/+1 |
| | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | console on USB | ||||
| | | * / | | | | gpio_led: bugs fixed, PX4FMUv2 support added | Anton Babushkin | 2014-02-11 | 1 | -0/+1 |
| | | |/ / / / | |||||
| | * / / / / | Added support for driver rangefinder | Lorenz Meier | 2014-03-08 | 1 | -0/+1 |
| | |/ / / / | |||||
* | | | | | | Merged mavlink_beta2 | Lorenz Meier | 2014-03-11 | 1 | -1/+0 |
|\| | | | | | |||||
| * | | | | | mavlink_onboard removed | Anton Babushkin | 2014-02-28 | 1 | -1/+0 |
| |/ / / / | |||||
* | | | | | Merged beta into paul_estimator | Lorenz Meier | 2014-02-16 | 1 | -2/+4 |
|\| | | | | |||||
| * | | | | Merged master into beta | Lorenz Meier | 2014-02-11 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| * | | | | | mc_att_control_vector renamed to mc_att_control | Anton Babushkin | 2014-01-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'autostart_cleanup' into navigator_new_vector | Anton Babushkin | 2014-01-17 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'navigator_new' into navigator_new_vector | Anton Babushkin | 2014-01-17 | 1 | -1/+0 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into navigator_new | Thomas Gubler | 2014-01-17 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: makefiles/config_px4fmu-v1_backside.mk src/modules/commander/commander.cpp src/modules/sdlog2/sdlog2.c | ||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into navigator_new | Thomas Gubler | 2014-01-11 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ | Merge branch 'master' into navigator_new_vector | Anton Babushkin | 2014-01-14 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into navigator_new_vector | Anton Babushkin | 2014-01-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'navigator_new' into navigator_new_vector | Anton Babushkin | 2014-01-06 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'launchdetection' into navigator_new_fw | Thomas Gubler | 2013-12-29 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp | ||||
| | | * | | | | | | | | initial wip version of launchdetector | Thomas Gubler | 2013-11-15 | 1 | -0/+1 |
| | | | |_|_|_|_|_|/ | | | |/| | | | | | |