aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-04-248-58/+71
|\
| * Merge pull request #862 from thomasgubler/gitignore_tagsLorenz Meier2014-04-241-0/+1
| |\ | | | | | | add tags file to .gitignore
| | * add tags file to .gitignoreThomas Gubler2014-04-241-0/+1
| |/
| * Merge pull request #850 from PX4/mavlink_startup_cleanupLorenz Meier2014-04-222-29/+26
| |\ | | | | | | mavlink: Start the same in HIL mode as in normal mode. Requires all HIL ...
| | * mavlink: Start the same in HIL mode as in normal mode. Requires all HIL ↵Lorenz Meier2014-04-222-29/+26
| | | | | | | | | | | | tools to run sh /etc/init.d/rc.usb now. Improve UART error handling
| * | Revert "HIL: Increased MAVLink link wait time based on previous experience ↵Lorenz Meier2014-04-221-2/+1
| | | | | | | | | | | | | | | | | | that this is timing sensitive." This reverts commit 78bf7ed969624eacea35ae2bf402596aecb3c5a6.
| * | Merge pull request #854 from jean-m-cyr/masterLorenz Meier2014-04-222-3/+18
| |\ \ | | | | | | | | Reduce data manager SD card wear and tear
| | * | Reduce data manager SD card wear and tearJean Cyr2014-04-222-3/+18
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the data manager was first designed each file record contained a 2 byte header and an 126 byte data section, resulting in a record length of 128 bytes. Along the way it was decided to add 2 spare bytes to the record header, but regrettably the data section was not correspondingly reduced in size so we end up with a record length of 130 bytes. This is bad since it does not align with SD card flash sectors and results in more erase/write flash cycles than necessary thus reducing the SD cards life. This update reduced the data section of the data manager to 124, resulting in an optimal record length of 128 bytes. In order to avoid the reuse of data previously written data in the old format, which could result in catastrophic misinterpretation, the data manager file is checked at startup. If it is found to be in the old format, it is deleted and recreated with in the new record length. In this case previously stored data is lost, but that is far safer than the unpredictable result of using the old file.
| * | Merge pull request #853 from PX4/hil_batt_fixLorenz Meier2014-04-221-1/+1
| |\ \ | | | | | | | | commander: Also publish battery status in HIL, since we have a fake batt...
| | * | commander: Also publish battery status in HIL, since we have a fake battery ↵Lorenz Meier2014-04-221-1/+1
| |/ / | | | | | | | | | available and the system freaks out without knowing its main supply
| * | Merge pull request #848 from PX4/lpos_logfixLorenz Meier2014-04-221-24/+24
| |\ \ | | | | | | | | Lpos logfix
| | * | Fixed LPOS message in log, added ground flags fieldLorenz Meier2014-04-211-1/+1
| | | |
| | * | sdlog2: Fix indendation to expose length better, cut string lengths for ↵Lorenz Meier2014-04-211-24/+24
| | | | | | | | | | | | | | | | excessive strings
| | * | sdlog2: fix lpos labels string, shorten messages with excessive lengthLorenz Meier2014-04-211-3/+3
| | |/
| * | Merge pull request #851 from PX4/hil_hotfixLorenz Meier2014-04-221-1/+2
| |\ \ | | |/ | |/| HIL: Increased MAVLink link wait time based on previous experience that ...
| | * HIL: Increased MAVLink link wait time based on previous experience that this ↵Lorenz Meier2014-04-221-1/+2
| |/ | | | | | | is timing sensitive.
| * Merge pull request #844 from PX4/mavlink_batt_fixLorenz Meier2014-04-211-1/+1
| |\ | | | | | | mavlink: remaining battery scaling fixed
| | * mavlink: remaining battery scaling fixedAnton Babushkin2014-04-211-1/+1
| |/
* | Merge remote-tracking branch 'private_swissfang/mtecs' into mtecsThomas Gubler2014-04-24384-6320/+25502
|\ \ | | | | | | | | | | | | Conflicts: src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
| * | simple underspeed protection for mtecsThomas Gubler2014-04-213-12/+65
| | |
| * | Merge branch 'mtecs_takeoff' into mtecsThomas Gubler2014-04-215-28/+112
| |\ \
| | * | Merge remote-tracking branch 'upstream/master' into mtecs_takeoffThomas Gubler2014-04-2116-82/+182
| | |\|
| | * | Merge branch 'mtecs' into mtecs_takeoffThomas Gubler2014-04-18221-216/+10714
| | |\ \
| | * | | mtecs: add comment about setting the standard limitsThomas Gubler2014-04-061-2/+2
| | | | |
| | * | | Merge branch 'mtecs' into mtecs_takeoffThomas Gubler2014-04-061-11/+11
| | |\ \ \
| | * \ \ \ Merge branch 'mtecs' into mtecs_takeoffThomas Gubler2014-04-0630-695/+1007
| | |\ \ \ \
| | * | | | | mtecs: first rough version of takeoff modeThomas Gubler2014-03-275-28/+112
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-04-2116-82/+182
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | fw_config_fixesLorenz Meier2014-04-202-5/+5
| | | | | |
| | * | | | Merge pull request #827 from PX4/mavlink_range_finderLorenz Meier2014-04-208-21/+67
| | |\ \ \ \ | | | | | | | | | | | | | | Mavlink range finder
| | | * \ \ \ Merged masterLorenz Meier2014-04-2016-69/+192
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #820 from PX4/filter_nan_guardLorenz Meier2014-04-191-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | pauls estimator: Added NaN guard before publishing
| | | * | | | | pauls estimator: Added NaN guard before publishingLorenz Meier2014-04-091-1/+1
| | | | | | | |
| | * | | | | | Merge pull request #835 from TickTock-/blinkm_fixLorenz Meier2014-04-191-46/+95
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Blinkm fix
| | | * | | | | | Fixed blinkm state indication (was not properly reporting flight mode). ↵TickTock-2014-04-161-46/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added flashing orange safety disarmed state indicator and solid blue failsafe indicator. Changed safety on state to solid cyan. Increased LiPo cellcount support to 6.
| | * | | | | | | Merge pull request #829 from PX4/uploader_hotfixLorenz Meier2014-04-191-2/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | Hotfix to PX4IO uploader. There are no known mishaps due to it, but very...
| | | * | | | | | Hotfix to PX4IO uploader. There are no known mishaps due to it, but very ↵Lorenz Meier2014-04-151-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clearly the IO firmware flashing process should be verified after an upload.
| | * | | | | | | Merge pull request #838 from PX4/fix_mission_topicLorenz Meier2014-04-184-7/+7
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | fix mission topic bug, clearer naming
| | | * | | | | | navigator: wrong mission topic was copied, clearer naming of offboard ↵Julian Oes2014-04-184-7/+7
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | mission now
| | | | * | | | Merged master into mavlink_range_finderLorenz Meier2014-04-130-0/+0
| | | | |\ \ \ \
| | | | * | | | | Untangled local pos and distance messages, now sending distance messages ↵Lorenz Meier2014-04-132-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only for actual distance measuring devices
| | | | * | | | | Added rangefinder message to MAVLink appLorenz Meier2014-04-133-0/+50
| | | | | | | | |
| | | | * | | | | Added fields to range finder clarifying sensor propertiesLorenz Meier2014-04-131-2/+9
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into mtecsThomas Gubler2014-04-18221-216/+10714
| |\| | | | | | | | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge pull request #828 from PX4/cox_cleanupLorenz Meier2014-04-144-3/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | startup: cleanup of cox mixer files (Thanks Rune)
| | | * | | | | | startup: cleanup of cox mixer files (Thanks Rune)Julian Oes2014-04-144-3/+3
| | |/ / / / / /
| | * | | | | | Merge pull request #822 from helenol/helen_mavlink_pullLorenz Meier2014-04-134-8/+77
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | Added a -w option to mavlink, added vicon messages to stream.
| | | * | | | | More whitespace all the time.Helen Oleynikova2014-04-101-67/+67
| | | | | | | |
| | | * | | | | More whitespace all the time.Helen Oleynikova2014-04-102-93/+93
| | | | | | | |
| | | * | | | | Whtespace.Helen Oleynikova2014-04-101-5/+5
| | | | | | | |