Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | removed files and code segments which should not be there and removed | Roman Bapst | 2014-11-10 | 2 | -10/+0 |
| | |||||
* | removed files which should not be in here | Roman Bapst | 2014-11-10 | 5 | -119/+0 |
| | |||||
* | pulled from PX4 master | Roman Bapst | 2014-11-10 | 8 | -10/+50 |
|\ | |||||
| * | Add a min PWM output so motors idle on arming. | Simon Wilks | 2014-10-23 | 1 | -0/+1 |
| | | |||||
| * | Merge remote-tracking branch 'upstream/master' into swissfang | Thomas Gubler | 2014-10-07 | 1 | -0/+30 |
| |\ | |||||
| | * | Upgraded unit test framework | Don Gagne | 2014-09-13 | 1 | -0/+30 |
| | | | |||||
| * | | Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang | Thomas Gubler | 2014-09-30 | 4 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | viper: removed wrong failsafe values | Julian Oes | 2014-09-23 | 1 | -2/+0 |
| | | | |||||
| * | | viper: changed some values for doors and bottle drop servos | Julian Oes | 2014-09-20 | 2 | -2/+3 |
| | | | |||||
| * | | Fix FX79 mixer | Lorenz Meier | 2014-09-03 | 1 | -8/+5 |
| | | | |||||
| * | | Merge branch 'master' into swissfang | Lorenz Meier | 2014-08-31 | 1 | -0/+3 |
| |\ \ | |||||
| * \ \ | 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 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | updated from remote | Roman Bapst | 2014-10-23 | 3 | -0/+93 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Updated from remote master | Roman Bapst | 2014-09-23 | 5 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | FTP: Update unit test for new header size. | Vladimir Ermakov | 2014-09-10 | 3 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | _list_test failed. | ||||
| * | | | | | | | | | | | | | | | New mavlink_ftp unit test data | Don Gagne | 2014-09-02 | 4 | -0/+0 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Better initial config for Phantom | Lorenz Meier | 2014-08-31 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | "Get newest update"Merge branch 'master' of https://github.com/PX4/Firmware | Roman Bapst | 2014-08-28 | 6 | -21/+49 |
|\| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Improve startup and payload handling | Lorenz Meier | 2014-08-26 | 5 | -17/+23 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | UAVCAN: clarification | Pavel Kirienko | 2014-08-24 | 1 | -1/+3 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | New UAVCAN initialization logic | Pavel Kirienko | 2014-08-23 | 2 | -4/+24 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
* / | | | | | | | | | | | | some hacks for the quadshot | Roman Bapst | 2014-08-22 | 4 | -0/+36 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | / | 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 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |