X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fstrat.c;h=5ae37974ec5538cb789f58a284e81d312997c5e4;hp=3f54716cc0294d6a6743f373fdb058f8a03c69f3;hb=aa68be2d5d596693bda1109e4ccd6489f613b4f7;hpb=5918edd6f4f713ef3c8b0b0020dd30a4fb8222ae diff --git a/projects/microb2010/mainboard/strat.c b/projects/microb2010/mainboard/strat.c index 3f54716..5ae3797 100644 --- a/projects/microb2010/mainboard/strat.c +++ b/projects/microb2010/mainboard/strat.c @@ -1,6 +1,6 @@ -/* +/* * Copyright Droids, Microb Technology (2009) - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -17,7 +17,7 @@ * * Revision : $Id: strat.c,v 1.6 2009-11-08 17:24:33 zer0 Exp $ * - * Olivier MATZ + * Olivier MATZ */ #include @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -57,7 +57,9 @@ #include "i2c_protocol.h" #include "main.h" #include "strat.h" +#include "strat_db.h" #include "strat_base.h" +#include "strat_corn.h" #include "strat_utils.h" #include "sensor.h" #include "actuator.h" @@ -65,183 +67,9 @@ #define COL_DISP_MARGIN 400 /* stop 40 cm in front of dispenser */ #define COL_SCAN_PRE_MARGIN 250 - -#ifdef TEST_BEACON - -#define BEACON_MAX_SAMPLES 100 -struct beacon_sample { - int16_t posx; - int16_t posy; - int16_t posa; - int16_t oppx; - int16_t oppy; - uint8_t time; -}; - -static struct beacon_sample beacon_sample[BEACON_MAX_SAMPLES]; -static uint8_t beacon_prev_time = 0; -static uint8_t beacon_cur_idx = 0; - -static void beacon_update_samples(void) -{ - int16_t opp_a, opp_d, opp_x, opp_y; - int8_t err; - uint8_t time; - - time = time_get_s(); - - /* one sample per second max */ - if (time <= beacon_prev_time) - return; - /* limit max number of samples */ - if (beacon_cur_idx >= BEACON_MAX_SAMPLES) - return; - - memset(&beacon_sample[beacon_cur_idx], 0, sizeof(beacon_sample[beacon_cur_idx])); - beacon_prev_time = time; - beacon_sample[beacon_cur_idx].time = time; - - /* get opponent pos; if not found, just set struct to 0 */ - err = get_opponent_xyda(&opp_x, &opp_y, &opp_d, &opp_a); - if (err == -1) - return; - - beacon_sample[beacon_cur_idx].posx = position_get_x_s16(&mainboard.pos); - beacon_sample[beacon_cur_idx].posy = position_get_y_s16(&mainboard.pos); - beacon_sample[beacon_cur_idx].posa = position_get_a_deg_s16(&mainboard.pos); - beacon_sample[beacon_cur_idx].oppx = opp_x; - beacon_sample[beacon_cur_idx].oppy = opp_y; - beacon_cur_idx++; -} - -void beacon_dump_samples(void) -{ - uint16_t i; - - for (i=0; izone->name); - - if (temple->flags & TEMPLE_F_MONOCOL) - printf_P(PSTR("MONOCOL ")); - else - printf_P(PSTR("BICOL ")); - - if (temple->flags & TEMPLE_F_ON_DISC) - printf_P(PSTR("ON_DISC ")); - else - printf_P(PSTR("ON_ZONE_0_1 ")); - - if (temple->flags & TEMPLE_F_OPPONENT) - printf_P(PSTR("OPPONENT ")); - else - printf_P(PSTR("OURS ")); - - if (temple->flags & TEMPLE_F_LINTEL) - printf_P(PSTR("LIN_ON_TOP ")); - else - printf_P(PSTR("COL_ON_TOP ")); - - printf_P(PSTR("\r\n")); - - printf_P(PSTR(" pos=(%d,%d,%d) ckpt=(%d,%d) ltime=%d\r\n"), - temple->x, temple->y, temple->a, - temple->checkpoint_x, temple->checkpoint_y, - temple->last_try_time); - printf_P(PSTR(" L: lev=%d da=%d,%d\r\n"), - temple->level_l, temple->dist_l, temple->angle_l); - printf_P(PSTR(" R: lev=%d da=%d,%d\r\n"), - temple->level_l, temple->dist_l, temple->angle_l); + strat_running = 1; } -void strat_dump_zone(struct build_zone *zone) +void strat_event_disable(void) { - if (!strat_infos.dump_enabled) - return; - - printf_P(PSTR(" zone %s: "), zone->name); - - if (zone->flags & ZONE_F_DISC) - printf_P(PSTR("DISC ")); - else if (zone->flags & ZONE_F_ZONE1) - printf_P(PSTR("ZONE1 ")); - else if (zone->flags & ZONE_F_ZONE0) - printf_P(PSTR("ZONE0 ")); - - if (zone->flags & ZONE_F_BUSY) - printf_P(PSTR("BUSY ")); - else - printf_P(PSTR("FREE ")); - - printf_P(PSTR("\r\n")); - - printf_P(PSTR(" lev=%d ckpt=(%d,%d) ltime=%d\r\n"), - zone->level, - zone->checkpoint_x, zone->checkpoint_y, - zone->last_try_time); + strat_running = 0; } -void strat_dump_static_cols(void) +/* call it just before launching the strat */ +void strat_init(void) { - if (!strat_infos.dump_enabled) - return; +#ifdef HOST_VERSION + position_set(&mainboard.pos, 298.16, + COLOR_Y(308.78), COLOR_A(70.00)); +#endif - printf_P(PSTR(" static cols: l0=%d l1=%d l2=%d\r\n"), - strat_infos.s_cols.flags & STATIC_COL_LINE0_DONE, - strat_infos.s_cols.flags & STATIC_COL_LINE1_DONE, - strat_infos.s_cols.flags & STATIC_COL_LINE2_DONE); -} + /* we consider that the color is correctly set */ + strat_running = 1; + strat_db_init(); + strat_set_speed(SPEED_DIST_FAST, SPEED_ANGLE_FAST); + time_reset(); + interrupt_traj_reset(); -void strat_dump_col_disp(void) -{ - if (!strat_infos.dump_enabled) - return; + i2c_cobboard_set_mode(I2C_COBBOARD_MODE_HARVEST); + i2c_ballboard_set_mode(I2C_BALLBOARD_MODE_HARVEST); - printf_P(PSTR(" c1 cnt=%d ltt=%d\r\n"), - strat_infos.c1.count, strat_infos.c1.last_try_time); - printf_P(PSTR(" c2 cnt=%d ltt=%d\r\n"), - strat_infos.c2.count, strat_infos.c2.last_try_time); - printf_P(PSTR(" c3 cnt=%d ltt=%d\r\n"), - strat_infos.c3.count, strat_infos.c3.last_try_time); + /* used in strat_base for END_TIMER */ + mainboard.flags = DO_ENCODERS | DO_CS | DO_RS | + DO_POS | DO_BD | DO_TIMER | DO_POWER; } -void strat_dump_lin_disp(void) +/* call it after each strat */ +void strat_exit(void) { - if (!strat_infos.dump_enabled) - return; - printf_P(PSTR(" l1 cnt=%d ltt=%d\r\n"), - strat_infos.l1.count, strat_infos.l1.last_try_time); - printf_P(PSTR(" l2 cnt=%d ltt=%d\r\n"), - strat_infos.l2.count, strat_infos.l2.last_try_time); +#ifndef HOST_VERSION + uint8_t flags; +#endif + strat_running = 0; + mainboard.flags &= ~(DO_TIMER); + strat_hardstop(); + time_reset(); + wait_ms(100); +#ifndef HOST_VERSION + IRQ_LOCK(flags); + mainboard.flags &= ~(DO_CS); + IRQ_UNLOCK(flags); + pwm_ng_set(LEFT_PWM, 0); + pwm_ng_set(RIGHT_PWM, 0); +#endif } -void strat_dump_all_temples(void) +/* called periodically (10ms) */ +void strat_event(void *dummy) { - struct temple *temple; - uint8_t i; + uint8_t flags; + int8_t lcob_near, rcob_near; + uint8_t lcob, rcob; + uint8_t lidx, ridx; - if (!strat_infos.dump_enabled) + /* ignore when strat is not running */ + if (strat_running == 0) return; - for (i=0; iflags & TEMPLE_F_VALID)) - continue; - strat_dump_temple(temple); - } -} + IRQ_LOCK(flags); + lcob = ballboard.lcob; + ballboard.lcob = I2C_COB_NONE; + rcob = ballboard.rcob; + ballboard.rcob = I2C_COB_NONE; + IRQ_UNLOCK(flags); -void strat_dump_all_zones(void) -{ - struct build_zone *zone; - uint8_t i; + /* XXX take opponent position into account */ - if (!strat_infos.dump_enabled) - return; +#ifdef HOST_VERSION + if (time_get_s() == 15) + cobboard.cob_count = 5; + if (time_get_s() == 16) + cobboard.cob_count = 0; + if (time_get_s() == 25) + cobboard.cob_count = 5; +#endif - for (i=0; iflags & ZONE_F_VALID)) - continue; - strat_dump_zone(zone); + /* detect cob on left side */ + lcob_near = corn_is_near(&lidx, I2C_LEFT_SIDE); + if (lcob_near && lcob != I2C_COB_NONE) { + if (strat_db.corn_table[lidx]->corn.color == I2C_COB_UNKNOWN) + DEBUG(E_USER_STRAT, "lcob %s %d", + lcob == I2C_COB_WHITE ? "white" : "black", lidx); + corn_set_color(strat_db.corn_table[lidx], lcob); } -} -/* display current information about the state of the game */ -void strat_dump_infos(const char *caller) -{ - if (!strat_infos.dump_enabled) - return; - - printf_P(PSTR("%s() dump strat infos:\r\n"), caller); - strat_dump_static_cols(); - strat_dump_col_disp(); - strat_dump_lin_disp(); - strat_dump_all_temples(); - strat_dump_all_zones(); -} + /* detect cob on right side */ + rcob_near = corn_is_near(&ridx, I2C_RIGHT_SIDE); + if (rcob_near && rcob != I2C_COB_NONE) { + if (strat_db.corn_table[ridx]->corn.color == I2C_COB_UNKNOWN) + DEBUG(E_USER_STRAT, "rcob %s %d", + rcob == I2C_COB_WHITE ? "white" : "black", ridx); + corn_set_color(strat_db.corn_table[ridx], rcob); + } -/* init current area state before a match. Dump update user conf - * here */ -void strat_reset_infos(void) -{ - uint8_t i; - - /* /!\ don't do a big memset() as there is static data */ - strat_infos.s_cols.flags = 0; - strat_infos.c1.count = 5; - strat_infos.c1.last_try_time = 0; - strat_infos.c2.count = 5; - strat_infos.c2.last_try_time = 0; - strat_infos.c3.count = 5; - strat_infos.c3.last_try_time = 0; - strat_infos.l1.count = 1; - strat_infos.l1.last_try_time = 0; - strat_infos.l2.count = 1; - strat_infos.l2.last_try_time = 0; - - strat_infos.taken_lintel = 0; - strat_infos.col_in_boobs = 0; - strat_infos.lazy_pickup_done = 0; - strat_infos.i2c_loaded_skipped = 0; - - memset(strat_infos.temple_list, 0, sizeof(strat_infos.temple_list)); - - for (i=0; i= 5 || want_pack) { + if (strat_db.corn_table[lidx]->corn.color != I2C_COB_WHITE && + strat_db.corn_table[lidx]->corn.color != I2C_COB_BLACK) + i2c_cobboard_pack(I2C_LEFT_SIDE); } else { - strat_infos.l1.x = 888; - strat_infos.l2.x = 1288; + if (strat_db.corn_table[lidx]->corn.color == I2C_COB_WHITE) + i2c_cobboard_autoharvest(I2C_LEFT_SIDE); + else if (strat_db.corn_table[lidx]->corn.color == I2C_COB_BLACK) + i2c_cobboard_deploy_nomove(I2C_LEFT_SIDE); + else + i2c_cobboard_deploy(I2C_LEFT_SIDE); } -} - -/* call it just before launching the strat */ -void strat_init(void) -{ - pickup_wheels_on(); - strat_reset_infos(); - - /* we consider that the color is correctly set */ - - strat_set_speed(SPEED_DIST_FAST, SPEED_ANGLE_FAST); - time_reset(); - interrupt_traj_reset(); - /* used in strat_base for END_TIMER */ - mainboard.flags = DO_ENCODERS | DO_CS | DO_RS | - DO_POS | DO_BD | DO_TIMER | DO_POWER; + /* control the cobboard mode for right spickle */ + if (get_cob_count() >= 5 || want_pack) { + if (strat_db.corn_table[lidx]->corn.color != I2C_COB_WHITE && + strat_db.corn_table[lidx]->corn.color != I2C_COB_BLACK) + i2c_cobboard_pack(I2C_RIGHT_SIDE); + } + else { + if (strat_db.corn_table[lidx]->corn.color == I2C_COB_WHITE) + i2c_cobboard_autoharvest(I2C_RIGHT_SIDE); + else if (strat_db.corn_table[lidx]->corn.color == I2C_COB_BLACK) + i2c_cobboard_deploy_nomove(I2C_RIGHT_SIDE); + else + i2c_cobboard_deploy(I2C_RIGHT_SIDE); + } -#ifdef TEST_BEACON - beacon_prev_time = 0; - beacon_cur_idx = 0; -#endif + /* limit speed when opponent is near */ + strat_limit_speed(); } -/* call it after each strat */ -void strat_exit(void) +static uint8_t strat_harvest(void) { - uint8_t flags; - - pickup_wheels_off(); - mainboard.flags &= ~(DO_TIMER); - strat_hardstop(); - time_reset(); - wait_ms(1000); - IRQ_LOCK(flags); - mainboard.flags &= ~(DO_CS); - pwm_ng_set(LEFT_PWM, 0); - pwm_ng_set(RIGHT_PWM, 0); - IRQ_UNLOCK(flags); + return 0; } -/* called periodically */ -void strat_event(void *dummy) +static uint8_t strat_eject(void) { - /* limit speed when opponent is close */ - strat_limit_speed(); + uint8_t err; -#ifdef TEST_BEACON - beacon_update_samples(); -#endif + //XXX return vals + strat_set_speed(600, SPEED_ANGLE_SLOW); + + trajectory_goto_xy_abs(&mainboard.traj, 2625, COLOR_Y(1847)); + err = wait_traj_end(TRAJ_FLAGS_NO_NEAR); + trajectory_a_abs(&mainboard.traj, COLOR_A(70)); + err = wait_traj_end(TRAJ_FLAGS_NO_NEAR); + + DEBUG(E_USER_STRAT, "%s():%d", __FUNCTION__, __LINE__); + strat_hardstop(); + + /* ball ejection */ + trajectory_a_abs(&mainboard.traj, COLOR_A(90)); + i2c_ballboard_set_mode(I2C_BALLBOARD_MODE_EJECT); + time_wait_ms(2000); + + /* half turn */ + i2c_cobboard_pack(I2C_LEFT_SIDE); + i2c_cobboard_pack(I2C_RIGHT_SIDE); + trajectory_a_rel(&mainboard.traj, COLOR_A(180)); + err = wait_traj_end(END_INTR|END_TRAJ); + + /* cob ejection */ + trajectory_d_rel(&mainboard.traj, -100); + err = wait_traj_end(END_INTR|END_TRAJ); + strat_running = ; + i2c_cobboard_set_mode(I2C_COBBOARD_MODE_EJECT); + time_wait_ms(2000); + + return 0; } -/* do static cols + first temples */ static uint8_t strat_beginning(void) { uint8_t err; - /* don't limit the speed when opponent is near: it can change - * the radius of the curves */ - strat_limit_speed_disable(); + strat_set_acc(ACC_DIST, ACC_ANGLE); +#ifdef HOST_VERSION + strat_set_speed(600, SPEED_ANGLE_FAST); +#else + /* 250 */ + strat_set_speed(250, SPEED_ANGLE_FAST); +#endif - err = strat_static_columns(0); + // strat_set_speed(600, 60); /* OK */ + strat_set_speed(250, 28); /* OK */ - strat_limit_speed_enable(); + trajectory_d_a_rel(&mainboard.traj, 1000, COLOR_A(20)); + err = WAIT_COND_OR_TRAJ_END(trajectory_angle_finished(&mainboard.traj), + TRAJ_FLAGS_STD); - if (!TRAJ_SUCCESS(err)) - return err; + strat_set_acc(ACC_DIST, ACC_ANGLE); + strat_set_speed(250, SPEED_ANGLE_SLOW); - /* go to disc to build the first temple */ +#if 1 + l1: + DEBUG(E_USER_STRAT, "%s():%d", __FUNCTION__, __LINE__); + if (get_cob_count() >= 5) + strat_set_speed(600, SPEED_ANGLE_FAST); - /* XXX if opponent is near disc, go to zone1 */ - err = strat_goto_disc(2); - if (!TRAJ_SUCCESS(err)) - return err; - DEBUG(E_USER_STRAT, "disc reached"); + err = line2line(LINE_UP, 0, LINE_R_DOWN, 2); + if (!TRAJ_SUCCESS(err)) { + strat_hardstop(); + time_wait_ms(2000); + goto l1; + } - /* can return END_ERROR or END_TIMER, should not happen - * here */ - err = strat_build_new_temple(&strat_infos.zone_list[0]); - if (!TRAJ_SUCCESS(err)) - return err; + l2: + DEBUG(E_USER_STRAT, "%s():%d", __FUNCTION__, __LINE__); + if (get_cob_count() >= 5) + strat_set_speed(600, SPEED_ANGLE_FAST); - /* bypass static2 if specified */ - if (strat_infos.conf.flags & STRAT_CONF_BYPASS_STATIC2) { - err = strat_escape(&strat_infos.zone_list[0], TRAJ_FLAGS_STD); - return err; + err = line2line(LINE_R_DOWN, 2, LINE_R_UP, 2); + if (!TRAJ_SUCCESS(err)) { + strat_hardstop(); + time_wait_ms(2000); + goto l2; } - /* get the last 2 columns, and build them on previous temple */ - err = strat_static_columns_pass2(); - if (!TRAJ_SUCCESS(err)) - return err; +#else + strat_set_speed(600, SPEED_ANGLE_FAST); + err = line2line(LINE_UP, 0, LINE_R_DOWN, 3); + err = line2line(LINE_R_DOWN, 3, LINE_R_UP, 2); + err = line2line(LINE_R_UP, 2, LINE_R_DOWN, 2); + err = line2line(LINE_R_DOWN, 2, LINE_R_UP, 3); + err = line2line(LINE_R_UP, 3, LINE_UP, 5); + err = line2line(LINE_UP, 5, LINE_L_DOWN, 2); + err = line2line(LINE_L_DOWN, 2, LINE_L_UP, 1); + err = line2line(LINE_L_UP, 1, LINE_L_DOWN, 1); + err = line2line(LINE_L_DOWN, 1, LINE_DOWN, 0); + wait_ms(500); + strat_hardstop(); + return END_TRAJ; +#endif - /* early opponent scan, for offensive strategy */ - if (strat_infos.conf.flags & STRAT_CONF_EARLY_SCAN) { - err = strat_pickup_lintels(); - /* ignore code */ + strat_eject(); - /* try to build on opponent (scan must be enabled) */ - err = strat_build_on_opponent_temple(); - /* ignore code */ - } + strat_set_speed(250, SPEED_ANGLE_FAST); - return err; -} + l4: + DEBUG(E_USER_STRAT, "%s():%d", __FUNCTION__, __LINE__); + if (get_cob_count() >= 5) + strat_set_speed(600, SPEED_ANGLE_FAST); -/* return true if we need to grab some more elements (lintel/cols) */ -uint8_t need_more_elements(void) -{ - if (time_get_s() <= 75) { - /* we have at least one col on each arm, build now */ - if ((get_column_count_left() >= 1) && - (get_column_count_right() >= 1)) - return 0; + err = line2line(LINE_DOWN, 5, LINE_L_UP, 2); + if (!TRAJ_SUCCESS(err)) { + strat_hardstop(); + time_wait_ms(2000); + goto l4; } - else { - if (get_column_count()) - return 0; + + l5: + DEBUG(E_USER_STRAT, "%s():%d", __FUNCTION__, __LINE__); + if (get_cob_count() >= 5) + strat_set_speed(600, SPEED_ANGLE_FAST); + + err = line2line(LINE_L_UP, 2, LINE_R_UP, 2); + if (!TRAJ_SUCCESS(err)) { + strat_hardstop(); + time_wait_ms(2000); + goto l5; } - return 1; + + DEBUG(E_USER_STRAT, "%s():%d", __FUNCTION__, __LINE__); + if (get_cob_count() >= 5) + strat_set_speed(600, SPEED_ANGLE_FAST); + + WAIT_COND_OR_TRAJ_END(distance_from_robot(2625, COLOR_Y(1847)) < 100, + TRAJ_FLAGS_STD); + strat_eject(); + + return END_TRAJ; } /* dump state (every 5 s max) */ @@ -684,124 +389,57 @@ uint8_t need_more_elements(void) } while (0) +/* return true if we need to grab some more elements */ +static uint8_t need_more_elements(void) +{ + if (time_get_s() <= 75) { + /* we have enough time left */ + if (get_ball_count() >= 4) + return 0; + if (get_cob_count() >= 4) + return 0; + if ((get_ball_count() >= 2) && + (get_cob_count() >= 2)) + return 0; + return 1; + } + else { + /* not much time remaining */ + if ((get_ball_count() >= 1) && + (get_cob_count() >= 1)) + return 0; + return 1; + } +} + uint8_t strat_main(void) { uint8_t err; - struct temple *temple = NULL; - struct build_zone *zone = NULL; - uint8_t last_print_cols = 0; - uint8_t last_print_lin = 0; - uint8_t last_print_temple = 0; - uint8_t last_print_zone = 0; - - /* do static cols + first temple */ + /* harvest the first cobs + balls */ err = strat_beginning(); - /* skip error code */ - while (1) { - + /* end of time exit ! */ if (err == END_TIMER) { DEBUG(E_USER_STRAT, "End of time"); strat_exit(); break; } - /* we have at least one col on each arm, build now */ if (need_more_elements() == 0) { - - /* try to build on opponent, will return - * END_TRAJ without doing anything if - * disabled */ - err = strat_build_on_opponent_temple(); + /* we have enough elements, go to eject */ + err = strat_eject(); if (!TRAJ_SUCCESS(err)) continue; - if (need_more_elements()) - continue; - - /* try to scan and build on our temple, will - * return END_TRAJ without doing anything if - * disabled */ - err = strat_check_temple_and_build(); - if (!TRAJ_SUCCESS(err)) - continue; - if (need_more_elements()) - continue; - - /* Else, do a simple build, as before */ - - temple = strat_get_best_temple(); - - /* one valid temple found */ - if (temple) { - DUMP_RATE_LIMIT(strat_dump_all_temples, last_print_temple); - - err = strat_goto_temple(temple); - if (!TRAJ_SUCCESS(err)) - continue; - - /* can return END_ERROR or END_TIMER, - * should not happen here */ - err = strat_grow_temple(temple); - if (!TRAJ_SUCCESS(err)) - continue; - - err = strat_escape(temple->zone, TRAJ_FLAGS_STD); - if (!TRAJ_SUCCESS(err)) - continue; - - continue; - } - - zone = strat_get_best_zone(); - if (zone) { - DUMP_RATE_LIMIT(strat_dump_all_zones, last_print_zone); - - DEBUG(E_USER_STRAT, "goto zone %s", zone->name); - err = strat_goto_build_zone(zone, zone->level); - if (!TRAJ_SUCCESS(err)) - continue; - DEBUG(E_USER_STRAT, "zone reached"); - - /* no error code except END_ERROR, should not happen */ - err = strat_build_new_temple(zone); - - err = strat_escape(zone, TRAJ_FLAGS_STD); - if (!TRAJ_SUCCESS(err)) - continue; - - continue; - } - - /* XXX hey what can we do here... :'( */ - DEBUG(E_USER_STRAT, "panic :)"); - time_wait_ms(1000); - continue; } - - /* else we need some elements (lintels, then columns) */ else { - if (strat_infos.l1.count != 0 && strat_infos.l2.count != 0) - DUMP_RATE_LIMIT(strat_dump_lin_disp, last_print_lin); - - err = strat_pickup_lintels(); - /* can return an error code, but we have - * nothing to do because pickup_column() - * starts with a goto_and_avoid() */ - if (!TRAJ_SUCCESS(err)) - nop(); - - DUMP_RATE_LIMIT(strat_dump_col_disp, last_print_cols); - - err = strat_pickup_columns(); + /* harvest */ + err = strat_harvest(); if (!TRAJ_SUCCESS(err)) - nop(); /* nothing to do */ - - /* XXX check here that we have elements, or do - * something else */ - /* if we cannot take elements, try to build */ + continue; } } - return END_TRAJ; + + return err; }