diff options
| author | James Goppert <james.goppert@gmail.com> | 2013-01-14 18:13:07 -0500 |
|---|---|---|
| committer | James Goppert <james.goppert@gmail.com> | 2013-01-14 18:13:07 -0500 |
| commit | 02a905df4c5ed6b54a76445f00967988cb7e18d1 (patch) | |
| tree | 5b95f260a639de60e4e93fd97796f15bbad1d4ec /apps | |
| parent | 4613d1247d0dc7091be4ac477053e73866455e2f (diff) | |
| parent | 35f0f570a6c0434c77db50407a7510677c1fb889 (diff) | |
| download | px4-firmware-02a905df4c5ed6b54a76445f00967988cb7e18d1.tar.gz px4-firmware-02a905df4c5ed6b54a76445f00967988cb7e18d1.tar.bz2 px4-firmware-02a905df4c5ed6b54a76445f00967988cb7e18d1.zip | |
Merge branch 'master' of git://github.com/PX4/Firmware into fault_detection
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/mavlink/waypoints.c | 7 | ||||
| -rw-r--r-- | apps/px4/tests/test_jig_voltages.c | 4 |
2 files changed, 6 insertions, 5 deletions
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) 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) { |