Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into ↵ | Lorenz Meier | 2014-08-26 | 8 | -17/+36 |
|\ | | | | | | | swissfang | ||||
| * | Do not modify startup where not absolutely required | Lorenz Meier | 2014-08-15 | 1 | -2/+0 |
| | | |||||
| * | Fix the index numbers and command max travel in the app for the drop servo. | Simon Wilks | 2014-08-14 | 1 | -3/+5 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' into test_bottle_drop_paul | Simon Wilks | 2014-08-14 | 1 | -1/+1 |
| |\ | |||||
| * | | Put payload outputs for AERT mixer onto right actuator group | Lorenz Meier | 2014-08-12 | 1 | -5/+6 |
| | | | |||||
| * | | Merged failsafe from master | Lorenz Meier | 2014-08-12 | 4 | -9/+15 |
| |\ \ | |||||
| | * | | Improved rcS handling, added failsafe flag. Needs further testing for USB ↵ | Lorenz Meier | 2014-08-12 | 4 | -5/+16 |
| | | | | | | | | | | | | | | | | stability | ||||
| * | | | Merge branch 'master' of github.com:PX4/Firmware into test_bottle_drop_paul | Lorenz Meier | 2014-08-11 | 1 | -4/+9 |
| |\| | | |||||
| * | | | Fix control group in Viper mixer | Lorenz Meier | 2014-08-11 | 1 | -8/+5 |
| | | | | |||||
| * | | | Viper mixer: Set failsafe values so we are not starting to command actuators | Lorenz Meier | 2014-08-11 | 1 | -0/+5 |
| | | | | |||||
| * | | | Fixed whitespace in rcS | Lorenz Meier | 2014-08-11 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into test_bottle_drop_paul | Julian Oes | 2014-08-09 | 3 | -3/+75 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: ROMFS/px4fmu_common/init.d/3035_viper | ||||
| * \ \ \ | Merged master | Lorenz Meier | 2014-08-09 | 32 | -185/+659 |
| |\ \ \ \ | |||||
| * | | | | | bottle_drop: hack to start bottle drop | Julian Oes | 2014-03-30 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Startup script: added viper script | Julian Oes | 2014-03-30 | 2 | -0/+15 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'px4/paul_estimator_numeric' into ↵ | Julian Oes | 2014-03-30 | 3 | -2/+11 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 18 | -63/+178 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'px4/master' into bottle_drop | Julian Oes | 2014-03-07 | 78 | -2793/+1384 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ROMFS/px4fmu_common/init.d/rcS | ||||
| * \ \ \ \ \ \ \ | Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into ↵ | Julian Oes | 2013-12-27 | 8 | -19/+241 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'fw_autoland_att_tecs_navigator' into bottle_drop_navigator | Julian Oes | 2013-12-03 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/modules/navigator/navigator_main.cpp | ||||
| * | | | | | | | | | | Bottle drop: added custom HIL startup script | Julian Oes | 2013-12-02 | 2 | -18/+11 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Bottle drop: Added HIL startup | Julian Oes | 2013-11-29 | 2 | -0/+104 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge remote-tracking branch 'juchlid/bottledrop' into bottle_drop_navigator | Julian Oes | 2013-11-29 | 2 | -0/+81 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/PX4/Firmware into bottledrop | Juchli D | 2013-11-15 | 21 | -202/+137 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Working bottle Drop test | Juchli D | 2013-11-15 | 1 | -0/+29 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Added custom start up of bottle drop | Juchli D | 2013-11-05 | 2 | -0/+52 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | UAVCAN: clarification | Pavel Kirienko | 2014-08-24 | 1 | -1/+3 |
| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | New UAVCAN initialization logic | Pavel Kirienko | 2014-08-23 | 2 | -4/+24 |
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | mavlink: stream names updated in configuration | Anton Babushkin | 2014-08-13 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | If we failed loading params, reset them (if the file handle is valid the ↵ | Lorenz Meier | 2014-08-11 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file is corrupted and there is no hope, if its just not present the reset command will not do anything) | ||||
* | | | | | | | | | | | Ensure that a failing dataman start does not abort boot | Lorenz Meier | 2014-08-11 | 1 | -2/+4 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | mixers: added Viper mixer | Julian Oes | 2014-08-09 | 2 | -1/+73 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Startup script: added viper script | Julian Oes | 2014-08-09 | 2 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mavlink/include/mavlink/v1.0 | ||||
* | | | | | | | | | | mixers: adapted FX79 mixer to have more pitch influence | Julian Oes | 2014-08-09 | 1 | -2/+2 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | mavlink, rc.usb: increase HIL_CONTROLS rate and datarate on USB to allow HIL ↵ | Anton Babushkin | 2014-07-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simulation @ 200Hz | ||||
* | | | | | | | | | Merge pull request #1217 from PX4/mavlinkrates2 | Lorenz Meier | 2014-07-31 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Mavlink: don't use mavlink helpers | ||||
| * | | | | | | | | | rc.usb: set RC_CHANNELS_RAW rate to 5Hz | Anton Babushkin | 2014-07-29 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge commit 'bd808ccf3a825ac1304a72dcede12478fda76857' into mavlinkrates2 | Anton Babushkin | 2014-07-25 | 4 | -1/+48 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | rcS: set rates for parameters and missions on USB connection | Anton Babushkin | 2014-07-25 | 1 | -0/+4 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Re-instate TECS default gains | Lorenz Meier | 2014-07-29 | 1 | -0/+4 |
| |/ / / / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #1128 from PX4/uavcan | Lorenz Meier | 2014-07-22 | 4 | -1/+48 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | Basic UAVCAN support | ||||
| * | | | | | | | | | Merge branch 'master' into uavcan | Pavel Kirienko | 2014-07-12 | 2 | -1/+52 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Renamed OUTPUT_MODE: can --> uavcan_esc | Pavel Kirienko | 2014-07-07 | 3 | -4/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merged master into uavcan | Lorenz Meier | 2014-07-06 | 19 | -89/+338 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | UAVCAN mixer renamed to /dev/uavcan/esc | Pavel Kirienko | 2014-05-08 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | UAVCAN quad X autostart setup | Lorenz Meier | 2014-05-08 | 4 | -1/+48 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Remove all handles to TECS params in startup scripts | Lorenz Meier | 2014-07-18 | 4 | -21/+0 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge pull request #1186 from PX4/logging | Lorenz Meier | 2014-07-17 | 1 | -9/+30 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-instance handling for sensors | ||||
| * | | | | | | | | | | | | Strip excessive binary text to save some flash, start all three sensor sets | Lorenz Meier | 2014-07-16 | 1 | -11/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Add support for external sensors in startup | Lorenz Meier | 2014-07-16 | 1 | -0/+15 |
| | | | | | | | | | | | | |