From 8bc233846633cc0922900376f5225be6365b4293 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 14 Jan 2013 09:18:17 -0800 Subject: Adapted upper and lower values for test jig voltages --- apps/px4/tests/test_jig_voltages.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps') diff --git a/apps/px4/tests/test_jig_voltages.c b/apps/px4/tests/test_jig_voltages.c index ca6d7fb68..10c93b264 100644 --- a/apps/px4/tests/test_jig_voltages.c +++ b/apps/px4/tests/test_jig_voltages.c @@ -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) { -- cgit v1.2.3 From 35f0f570a6c0434c77db50407a7510677c1fb889 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 14 Jan 2013 23:48:07 +0100 Subject: Hotfix for current active waypoint ID --- apps/mavlink/waypoints.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'apps') diff --git a/apps/mavlink/waypoints.c b/apps/mavlink/waypoints.c index 3832ebe70..a131b143b 100644 --- a/apps/mavlink/waypoints.c +++ b/apps/mavlink/waypoints.c @@ -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) -- cgit v1.2.3