Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into swissfang | Thomas Gubler | 2014-10-07 | 1 | -0/+1 |
|\ | |||||
| * | Merge pull request #1360 from DonLakeFlyer/UnitTestFramework | Lorenz Meier | 2014-10-05 | 1 | -0/+1 |
| |\ | | | | | | | Upgraded unit test framework | ||||
| | * | Upgraded unit test framework | Don Gagne | 2014-09-13 | 1 | -0/+1 |
| | | | |||||
* | | | re-enable MC apps on FMUV1 | Thomas Gubler | 2014-09-30 | 1 | -4/+4 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/master' into swissfang | Thomas Gubler | 2014-09-30 | 1 | -4/+4 |
|\| | | |||||
| * | | Deactivate FrSky telem by default | Lorenz Meier | 2014-09-30 | 1 | -1/+1 |
| | | | |||||
| * | | Flash optimization | Lorenz Meier | 2014-09-30 | 1 | -3/+3 |
| | | | |||||
* | | | Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang | Thomas Gubler | 2014-09-30 | 2 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/lib/external_lgpl/tecs/tecs.cpp src/modules/commander/commander_params.c src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp src/modules/navigator/navigator_main.cpp | ||||
| * | | Make space on FMUv1 | Lorenz Meier | 2014-09-17 | 1 | -3/+0 |
| |/ | |||||
| * | Added mavlink_ftp unit test | Don Gagne | 2014-09-02 | 1 | -0/+3 |
| | | |||||
* | | swissfang: don't build MC apps on FMU1 | Thomas Gubler | 2014-09-07 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into ↵ | Lorenz Meier | 2014-08-26 | 1 | -0/+5 |
|\ \ | |/ |/| | | | swissfang | ||||
| * | Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul | Lorenz Meier | 2014-08-21 | 1 | -4/+1 |
| |\ | |||||
| * \ | Merged master | Lorenz Meier | 2014-08-09 | 9 | -19/+189 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'px4/paul_estimator_numeric' into ↵ | Julian Oes | 2014-03-30 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -1/+8 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'px4/master' into bottle_drop | Julian Oes | 2014-03-07 | 6 | -338/+41 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ROMFS/px4fmu_common/init.d/rcS | ||||
| * \ \ \ \ \ | Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into ↵ | Julian Oes | 2013-12-27 | 4 | -3/+165 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Make some space on FMUv1 | Lorenz Meier | 2014-08-17 | 1 | -4/+1 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Revert "Remove old TECS implementation - we can really only decently ↵ | Lorenz Meier | 2014-07-29 | 3 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -1/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Basic UAVCAN support | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into uavcan | Pavel Kirienko | 2014-07-08 | 4 | -2/+7 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merged master into uavcan | Lorenz Meier | 2014-07-06 | 6 | -11/+155 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merged master into uavcan | Lorenz Meier | 2014-05-07 | 4 | -5/+7 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixed hardcoded include path | Pavel Kirienko | 2014-05-06 | 1 | -0/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Initial UAVCAN integration. The library compiles successfully, CAN driver ↵ | Pavel Kirienko | 2014-05-06 | 3 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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() | ||||
* | | | | | | | | | | | Merged master | Lorenz Meier | 2014-07-15 | 6 | -10/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Board config cleanup for external bus support | Lorenz Meier | 2014-07-08 | 1 | -0/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | LL40LS driver: Added new driver to the config make files | akdslr | 2014-07-08 | 2 | -0/+2 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1145 from DonLakeFlyer/MoreWarnings | Lorenz Meier | 2014-07-08 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix compiler warnings | ||||
| | * | | | | | | | | | | Fix compiler warnings | Don Gagne | 2014-07-07 | 1 | -1/+5 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merged master | Lorenz Meier | 2014-07-07 | 2 | -1/+1 |
| |\| | | | | | | | | | | |||||
| | * | | | | | | | | | | Move a seldomly used module to test config | Lorenz Meier | 2014-07-06 | 2 | -1/+1 |
| | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| * / | | | | | | | | | Cleaning up sub modules | Lorenz Meier | 2014-07-07 | 1 | -0/+1 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into mtecs | Thomas Gubler | 2014-06-28 | 3 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Enable new lookup lib | Lorenz Meier | 2014-06-28 | 3 | -0/+3 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Remove old TECS implementation - we can really only decently flight-test and ↵ | Lorenz Meier | 2014-06-28 | 3 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support one. | ||||
| * | | | | | | | | | | make launch detector more flash efficient | Lorenz Meier | 2014-06-01 | 1 | -5/+1 |
| |/ / / / / / / / / | |||||
* / / / / / / / / / | Enable matlab bridge in test setup | Lorenz Meier | 2014-06-10 | 1 | -0/+5 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge branch 'master' of github.com:PX4/Firmware into pca8574 | Lorenz Meier | 2014-05-29 | 7 | -9/+157 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Allow any GCC 4.7 subversion | Lorenz Meier | 2014-05-23 | 1 | -3/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | makefiles: check for correct arm-none-eabi-gcc version | Julian Oes | 2014-05-22 | 1 | -2/+12 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix aerocore config | Lorenz Meier | 2014-05-15 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'ekf_params' of github.com:PX4/Firmware | Lorenz Meier | 2014-05-15 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merged master | Lorenz Meier | 2014-05-07 | 4 | -5/+7 |
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | |