fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 07:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/PX4/Firmware into fault_detection

Browse Source
This commit is contained in:
James Goppert
2013-01-14 18:13:07 -05:00
parent 4613d1247d 35f0f570a6
commit 02a905df4c
3 changed files with 60 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/mavlink/waypoints.c
+4 -3
View File
@@ -408,9 +408,10 @@ void check_waypoints_reached(uint64_t now, const struct vehicle_global_position_
cur_wp->current = 0;
if (wpm->current_active_wp_id == wpm->size - 1 && wpm->size > 1) {
//the last waypoint was reached, if auto continue is
//activated restart the waypoint list from the beginning
wpm->current_active_wp_id = 1;
/* the last waypoint was reached, if auto continue is
* activated restart the waypoint list from the beginning
*/
wpm->current_active_wp_id = 0;
} else {
if ((uint16_t)(wpm->current_active_wp_id + 1) < wpm->size)
apps/px4/tests/test_jig_voltages.c
+2 -2
View File
@@ -120,8 +120,8 @@ int test_jig_voltages(int argc, char *argv[])
warnx("\t ADC operational.\n");
/* Expected values */
int16_t expected_min[] = {2700, 2700, 2200, 2000};
int16_t expected_max[] = {3000, 3000, 2500, 2200};
int16_t expected_min[] = {2800, 2800, 1800, 800};
int16_t expected_max[] = {3100, 3100, 2100, 1100};
char *check_res[channels];
if (channels < 4) {