vt100: include pgmspace.h as we use PROGMEM macro
[aversive.git] / projects / microb2010 / mainboard / strat.c
index 19c6883..6090ca8 100644 (file)
@@ -58,6 +58,7 @@
 #include "../common/i2c_commands.h"
 #include "i2c_protocol.h"
 #include "main.h"
+#include "cs.h"
 #include "strat.h"
 #include "strat_db.h"
 #include "strat_base.h"
@@ -74,10 +75,14 @@ static volatile uint8_t strat_running = 0;
 volatile uint8_t strat_want_pack = 0;
 volatile uint8_t strat_lpack60 = 0;
 volatile uint8_t strat_rpack60 = 0;
+
+volatile uint8_t strat_opponent_lpack = 0;
+volatile uint8_t strat_opponent_rpack = 0;
+
 struct strat_conf strat_conf = {
        .dump_enabled = 0,
        .opp_orange = 90,
-       .orphan_tomato = 50,
+       .orphan_tomato = 45,
        .flags = 0,
 };
 
@@ -96,6 +101,7 @@ void strat_preinit(void)
                DO_POS | DO_BD | DO_POWER;
 
        strat_db_init();
+       strat_conf.prev_wait_obstacle = -5;
        strat_conf_dump(__FUNCTION__);
        strat_db_dump(__FUNCTION__);
 }
@@ -106,10 +112,14 @@ void strat_conf_dump(const char *caller)
                return;
 
        printf_P(PSTR("-- conf --\r\n"));
-       printf_P(PSTR("opp_orange = %d\n"), strat_conf.opp_orange);
-       printf_P(PSTR("orphan_tomato = %d\n"), strat_conf.orphan_tomato);
-       printf_P(PSTR("our_orange = %s\n"),
+       printf_P(PSTR("our_orange = %s\r\n"),
                 (strat_conf.flags & STRAT_CONF_OUR_ORANGE) ? "y":"n");
+       printf_P(PSTR("wait_obstacle = %s\r\n"),
+                (strat_conf.flags & STRAT_CONF_WAIT_OBSTACLE) ? "y":"n");
+       printf_P(PSTR("straight begin = %s\r\n"),
+                (strat_conf.flags & STRAT_CONF_STRAIGHT_BEGIN) ? "y":"n");
+       printf_P(PSTR("opp_orange = %d\r\n"), strat_conf.opp_orange);
+       printf_P(PSTR("orphan_tomato = %d\r\n"), strat_conf.orphan_tomato);
 }
 
 void strat_event_enable(void)
@@ -136,6 +146,8 @@ void strat_init(void)
        time_reset();
        interrupt_traj_reset();
 
+       i2c_cobboard_deploy(I2C_LEFT_SIDE);
+       i2c_cobboard_deploy(I2C_RIGHT_SIDE);
        i2c_cobboard_set_mode(I2C_COBBOARD_MODE_HARVEST);
        i2c_ballboard_set_mode(I2C_BALLBOARD_MODE_HARVEST);
 
@@ -179,8 +191,9 @@ static void check_tomato(void)
                uint8_t k;
 
                for (k = 0; k < TOMATO_NB; k++) {
-                       if (strat_db.tomato_table[k]->time_removed != -1 &&
-                           strat_db.tomato_table[k]->time_removed + 2 == time_get_s()) {
+                       if (strat_db.tomato_table[k]->present == 1 &&
+                           strat_db.tomato_table[k]->time_removed != -1 &&
+                           strat_db.tomato_table[k]->time_removed + 2 <= time_get_s()) {
 #ifdef HOST_VERSION
                                printf("remove tomato %d\n", k);
 #endif
@@ -210,6 +223,20 @@ static void check_tomato(void)
 #endif
 }
 
+static void remove_cob(uint8_t idx)
+{
+       if (strat_db.corn_table[idx]->corn.color == I2C_COB_BLACK)
+               return;
+
+       if (strat_db.corn_table[idx]->time_removed == -1) {
+               strat_db.corn_table[idx]->time_removed = time_get_s();
+#ifdef HOST_VERSION
+               cobboard.cob_count ++;
+               printf("add cob %d\n", idx);
+#endif
+       }
+}
+
 /* mark corn as not present and give correct commands to the cobboard
  * for spickles */
 static void check_corn(void)
@@ -220,6 +247,10 @@ static void check_corn(void)
        uint8_t lidx, ridx;
        static uint8_t prev_check_time;
        uint8_t cur_time;
+       uint8_t need_lpack, need_rpack;
+       int16_t l_xspickle, l_yspickle;
+       int16_t r_xspickle, r_yspickle;
+       uint8_t l_y_too_high_pack = 0, r_y_too_high_pack = 0;
 
        /* read sensors from ballboard */
        IRQ_LOCK(flags);
@@ -229,16 +260,16 @@ static void check_corn(void)
        ballboard.rcob = I2C_COB_NONE;
        IRQ_UNLOCK(flags);
 
-       /* XXX take opponent position into account */
-
        /* check present cobs once per second */
        cur_time = time_get_s();
        if (cur_time != prev_check_time) {
                uint8_t i;
 
+               /* only useful for simu */
                for (i = 0; i < CORN_NB; i++) {
-                       if (strat_db.corn_table[i]->time_removed != -1 &&
-                           strat_db.corn_table[i]->time_removed + 2 == time_get_s()) {
+                       if (strat_db.corn_table[i]->present == 1 &&
+                           strat_db.corn_table[i]->time_removed != -1 &&
+                           strat_db.corn_table[i]->time_removed + 2 <= time_get_s()) {
 #ifdef HOST_VERSION
                                printf("remove cob %d\n", i);
 #endif
@@ -249,90 +280,139 @@ static void check_corn(void)
        }
 
        /* detect cob on left side */
-       lcob_near = corn_is_near(&lidx, I2C_LEFT_SIDE);
+       lcob_near = corn_is_near(&lidx, I2C_LEFT_SIDE,
+                                &l_xspickle, &l_yspickle);
        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);
        }
+       if (cur_time > 5 && !__y_is_more_than(l_yspickle, 600))
+               l_y_too_high_pack = 1;
 
        /* detect cob on right side */
-       rcob_near = corn_is_near(&ridx, I2C_RIGHT_SIDE);
+       rcob_near = corn_is_near(&ridx, I2C_RIGHT_SIDE,
+                                &r_xspickle, &r_yspickle);
        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);
        }
+       if (cur_time > 5 && !__y_is_more_than(r_yspickle, 600))
+               r_y_too_high_pack = 1;
+
+       /* re-enable white cob */
+       if (lcob == I2C_COB_WHITE && lcob_near &&
+           strat_db.corn_table[lidx]->present == 0) {
+               strat_db.corn_table[lidx]->present = 1;
+               strat_db.corn_table[lidx]->time_removed = -1;
+       }
+       if (rcob == I2C_COB_WHITE && rcob_near &&
+           strat_db.corn_table[ridx]->present == 0) {
+               strat_db.corn_table[ridx]->present = 1;
+               strat_db.corn_table[ridx]->time_removed = -1;
+       }
 
        /* control the cobboard mode for left spickle */
-       if (lcob_near && strat_db.corn_table[lidx]->present) {
-               if (get_cob_count() >= 5 || strat_want_pack || strat_lpack60) {
+       need_lpack = get_cob_count() >= 5 || strat_want_pack ||
+               strat_lpack60 || strat_opponent_lpack || l_y_too_high_pack;
+
+       if (lcob_near &&
+           (strat_db.corn_table[lidx]->present ||
+            strat_db.corn_table[lidx]->time_removed == -1)) {
+               if (need_lpack) {
                        /* nothing  */
                }
                else {
                        /* deploy spickle and harvest white ones */
-                       if (strat_db.corn_table[lidx]->corn.color == I2C_COB_WHITE) {
+                       if (strat_db.corn_table[lidx]->corn.color == I2C_COB_WHITE)
                                i2c_cobboard_autoharvest_nomove(I2C_LEFT_SIDE);
-                               if (strat_db.corn_table[lidx]->time_removed == -1
-#ifndef HOST_VERSION
-                                   && cobboard.status == I2C_COBBOARD_STATUS_LBUSY
-#endif
-                                   ) {
-                                       strat_db.corn_table[lidx]->time_removed = time_get_s();
-#ifdef HOST_VERSION
-                                       cobboard.cob_count ++;
-                                       printf("add cob %d\n", lidx);
-#endif
-                               }
-                       }
                        else
                                i2c_cobboard_deploy_nomove(I2C_LEFT_SIDE);
+                       remove_cob(lidx);
                }
        }
        else {
                /* no cob near us, we can pack or deploy freely */
-               if (get_cob_count() >= 5 || strat_want_pack || strat_lpack60)
+               if (need_lpack)
                        i2c_cobboard_pack_weak(I2C_LEFT_SIDE);
                else
                        i2c_cobboard_deploy(I2C_LEFT_SIDE);
        }
 
        /* control the cobboard mode for right spickle */
-       if (rcob_near && strat_db.corn_table[ridx]->present) {
-               if (get_cob_count() >= 5 || strat_want_pack || strat_rpack60) {
+       need_rpack = get_cob_count() >= 5 || strat_want_pack ||
+               strat_rpack60 || strat_opponent_rpack || r_y_too_high_pack;
+       if (rcob_near &&
+           (strat_db.corn_table[ridx]->present ||
+            strat_db.corn_table[ridx]->time_removed == -1)) {
+               if (need_rpack) {
                        /* nothing */
                }
                else {
                        /* deploy spickle and harvest white ones */
-                       if (strat_db.corn_table[ridx]->corn.color == I2C_COB_WHITE) {
+                       if (strat_db.corn_table[ridx]->corn.color == I2C_COB_WHITE)
                                i2c_cobboard_autoharvest_nomove(I2C_RIGHT_SIDE);
-                               if (strat_db.corn_table[ridx]->time_removed == -1
-#ifndef HOST_VERSION
-                                   && cobboard.status == I2C_COBBOARD_STATUS_RBUSY
-#endif
-                                   ) {
-                                       strat_db.corn_table[ridx]->time_removed = time_get_s();
-#ifdef HOST_VERSION
-                                       cobboard.cob_count ++;
-                                       printf("add cob %d\n", ridx);
-#endif
-                               }
-                       }
                        else
                                i2c_cobboard_deploy_nomove(I2C_RIGHT_SIDE);
+                       remove_cob(ridx);
                }
        }
        else {
                /* no cob near us, we can pack or deploy freely */
-               if (get_cob_count() >= 5 || strat_want_pack || strat_rpack60)
+               if (need_rpack)
                        i2c_cobboard_pack_weak(I2C_RIGHT_SIDE);
                else
                        i2c_cobboard_deploy(I2C_RIGHT_SIDE);
        }
 }
 
+/* check opponent position */
+void check_opponent(void)
+{
+       int16_t opp_x, opp_y;
+       int16_t opp_d, opp_a;
+       uint8_t i, j;
+
+       strat_opponent_lpack = 0;
+       strat_opponent_rpack = 0;
+
+       if (get_opponent_xyda(&opp_x, &opp_y, &opp_d, &opp_a) < 0)
+               return;
+
+       /* pack spickles if opponent too close */
+       if (opp_d < 600) {
+               if (opp_a > 45 && opp_a < 135)
+                       strat_opponent_lpack = 1;
+               if (opp_a > 225 && opp_a < 315)
+                       strat_opponent_rpack = 1;
+       }
+
+       /* check for oranges after 5 seconds */
+       if (time_get_s() > 5) {
+               if (mainboard.our_color == I2C_COLOR_YELLOW) {
+                       if (opp_y < 500 && opp_x < 500)
+                               strat_db.our_oranges_count = 0;
+                       if (opp_y < 500 && opp_x > AREA_X - 500)
+                               strat_db.opp_oranges_count = 0;
+               }
+               else {
+                       if (opp_y > AREA_Y - 500 && opp_x < 500)
+                               strat_db.our_oranges_count = 0;
+                       if (opp_y > AREA_Y - 500 && opp_x > AREA_X - 500)
+                               strat_db.opp_oranges_count = 0;
+               }
+       }
+
+       /* malus for some tomatoes and cobs, visited by opponent */
+       if (xycoord_to_ijcoord(&opp_x, &opp_y, &i, &j) < 0)
+               return;
+
+       strat_db.wp_table[i][j].opp_visited = 1;
+}
+
 /* called periodically (10ms) */
 void strat_event(void *dummy)
 {
@@ -340,6 +420,7 @@ void strat_event(void *dummy)
        if (strat_running == 0)
                return;
 
+       check_opponent();
        check_tomato();
        check_corn();
 
@@ -357,7 +438,7 @@ static uint8_t robot_is_on_eject_line(void)
        x = position_get_x_s16(&mainboard.pos);
        y = position_get_y_s16(&mainboard.pos);
 
-       if (xycoord_to_ijcoord(&x, &y, &i, &j) < 0)
+       if (xycoord_to_ijcoord_not_corn(&x, &y, &i, &j) < 0)
                return 0;
 
        if (!wp_belongs_to_line(i, j, 5, LINE_UP) &&
@@ -381,7 +462,7 @@ static uint8_t eject_select_speed(void)
                return 0; /* fast */
        }
 
-       if (xycoord_to_ijcoord(&x, &y, &i, &j) < 0) {
+       if (xycoord_to_ijcoord_not_corn(&x, &y, &i, &j) < 0) {
                DEBUG(E_USER_STRAT, "%s(): cannot find waypoint at %d,%d",
                      __FUNCTION__, x, y);
                return 1; /* slow */
@@ -419,7 +500,7 @@ static uint8_t strat_eject(void)
        }
 
        /* go to eject point */
-       trajectory_goto_xy_abs(&mainboard.traj, 2625, COLOR_Y(1847));
+       trajectory_goto_forward_xy_abs(&mainboard.traj, 2625, COLOR_Y(1847));
        err = WAIT_COND_OR_TRAJ_END(speedify_eject(),
                                    TRAJ_FLAGS_NO_NEAR);
        /* err is never == 0 because speedify_eject() always return 0 */
@@ -434,6 +515,7 @@ static uint8_t strat_eject(void)
        /* ball ejection */
        if (get_ball_count() > 0) {
                i2c_ballboard_set_mode(I2C_BALLBOARD_MODE_EJECT);
+               time_wait_ms(300);
                trajectory_a_abs(&mainboard.traj, COLOR_A(70));
                err = wait_traj_end(TRAJ_FLAGS_NO_NEAR);
                if (!TRAJ_SUCCESS(err))
@@ -444,35 +526,40 @@ static uint8_t strat_eject(void)
 #ifdef HOST_VERSION
                time_wait_ms(2000);
 #else
-               WAIT_COND_OR_TIMEOUT(ballboard.status == I2C_BALLBOARD_STATUS_F_BUSY,
-                                    2000);
                WAIT_COND_OR_TIMEOUT(ballboard.status == I2C_BALLBOARD_STATUS_F_READY,
                                     2000);
 #endif
        }
+       else {
+               /* to pack spickles */
+               time_wait_ms(300);
+       }
 
-       /* half turn */
-       trajectory_a_abs(&mainboard.traj, COLOR_A(-110));
-       err = wait_traj_end(END_INTR|END_TRAJ);
-       if (!TRAJ_SUCCESS(err))
-               goto fail;
+       if (get_cob_count() > 0 ||
+           cobboard.status == I2C_COBBOARD_STATUS_LBUSY ||
+           cobboard.status == I2C_COBBOARD_STATUS_RBUSY) {
+               /* half turn */
+               trajectory_a_abs(&mainboard.traj, COLOR_A(-110));
+               err = wait_traj_end(END_INTR|END_TRAJ);
+               if (!TRAJ_SUCCESS(err))
+                       goto fail;
 
-       /* cob ejection */
-       trajectory_d_rel(&mainboard.traj, -70);
-       err = wait_traj_end(END_INTR|END_TRAJ);
-       if (!TRAJ_SUCCESS(err))
-               goto fail;
+               /* cob ejection */
+               trajectory_d_rel(&mainboard.traj, -70);
+               err = wait_traj_end(END_INTR|END_TRAJ);
+               if (!TRAJ_SUCCESS(err))
+                       goto fail;
 
-       if (get_cob_count() > 0) {
                i2c_cobboard_set_mode(I2C_COBBOARD_MODE_EJECT);
                time_wait_ms(2000);
-       }
 
-       /* cob ejection */
-       trajectory_d_rel(&mainboard.traj, 70);
-       err = wait_traj_end(END_INTR|END_TRAJ);
-       if (!TRAJ_SUCCESS(err))
-               goto fail;
+
+               /* cob ejection */
+               trajectory_d_rel(&mainboard.traj, 70);
+               err = wait_traj_end(END_INTR|END_TRAJ);
+               if (!TRAJ_SUCCESS(err))
+                       goto fail;
+       }
 
        strat_db_dump(__FUNCTION__);
        err = END_TRAJ;
@@ -490,7 +577,9 @@ static uint8_t strat_beginning(uint8_t do_initturn)
        strat_set_acc(ACC_DIST, ACC_ANGLE);
 
        if (do_initturn) {
-               strat_set_speed(600, 60); /* OK */
+               //strat_set_speed(600, 60);
+               //strat_set_speed(450, 50);
+               strat_set_speed(350, 40);
                trajectory_d_a_rel(&mainboard.traj, 1000, COLOR_A(20));
                err = WAIT_COND_OR_TRAJ_END(trajectory_angle_finished(&mainboard.traj),
                                            TRAJ_FLAGS_STD);
@@ -499,11 +588,27 @@ static uint8_t strat_beginning(uint8_t do_initturn)
        strat_set_acc(ACC_DIST, ACC_ANGLE);
        strat_set_speed(SPEED_CLITOID_SLOW, SPEED_ANGLE_SLOW);
 
+ l1:
        err = line2line(0, LINE_UP, 2, LINE_R_DOWN, TRAJ_FLAGS_NO_NEAR);
+       if (err == END_OBSTACLE &&
+           strat_conf.flags & STRAT_CONF_WAIT_OBSTACLE &&
+           time_get_s() > strat_conf.prev_wait_obstacle + 5) {
+               strat_conf.prev_wait_obstacle = time_get_s();
+               time_wait_ms(2000);
+               goto l1;
+       }
        if (!TRAJ_SUCCESS(err))
                return err;
 
+ l2:
        err = line2line(2, LINE_R_DOWN, 2, LINE_R_UP, TRAJ_FLAGS_NO_NEAR);
+       if (err == END_OBSTACLE &&
+           strat_conf.flags & STRAT_CONF_WAIT_OBSTACLE &&
+           time_get_s() > strat_conf.prev_wait_obstacle + 5) {
+               strat_conf.prev_wait_obstacle = time_get_s();
+               time_wait_ms(2000);
+               goto l2;
+       }
        if (!TRAJ_SUCCESS(err)) {
                return err;
        }
@@ -511,6 +616,28 @@ static uint8_t strat_beginning(uint8_t do_initturn)
        return END_TRAJ;
 }
 
+static uint8_t strat_beginning2(uint8_t do_initturn)
+{
+       uint8_t err;
+
+       strat_set_acc(ACC_DIST, ACC_ANGLE);
+
+       if (do_initturn) {
+               strat_set_speed(600, 95); /* OK */
+               trajectory_d_a_rel(&mainboard.traj, 1000, COLOR_A(-40));
+               err = WAIT_COND_OR_TRAJ_END(trajectory_angle_finished(&mainboard.traj),
+                                           TRAJ_FLAGS_STD);
+               if (err == 0)
+                       return END_TRAJ;
+       }
+       else {
+               trajectory_goto_forward_xy_abs(&mainboard.traj,
+                                              375, COLOR_Y(597));
+               err = wait_traj_end(TRAJ_FLAGS_STD);
+       }
+       return err;
+}
+
 /* dump state (every 5 s max) */
 #define DUMP_RATE_LIMIT(dump, last_print)              \
        do {                                            \
@@ -546,11 +673,62 @@ static uint8_t need_more_elements(void)
 }
 #endif
 
+/* get tomatoes near our goals (12,5 and 12,3) */
+uint8_t get_opp_oranges(void)
+{
+       int16_t x, y;
+       uint8_t i, j;
+       uint8_t err;
+
+       DEBUG(E_USER_STRAT, "%s()", __FUNCTION__);
+
+       /* only if oranges are present */
+       if (strat_db.opp_oranges_count == 0)
+               return END_TRAJ;
+
+       strat_db.opp_oranges_count = 0;
+       x = position_get_x_s16(&mainboard.pos);
+       y = position_get_y_s16(&mainboard.pos);
+
+       if (xycoord_to_ijcoord_not_corn(&x, &y, &i, &j) < 0)
+               return END_ERROR;
+
+       /* not on eject point */
+       if (i != 11 || j != 6)
+               return END_ERROR;
+
+       strat_want_pack = 1;
+       strat_set_speed(SPEED_DIST_FAST, SPEED_ANGLE_FAST);
+
+       /* turn in the correct direction */
+       trajectory_a_abs(&mainboard.traj, COLOR_A(-90));
+       err = wait_traj_end(TRAJ_FLAGS_NO_NEAR);
+       if (!TRAJ_SUCCESS(err))
+               goto fail;
+
+       trajectory_goto_forward_xy_abs(&mainboard.traj, 2625, COLOR_Y(597));
+       err = wait_traj_end(TRAJ_FLAGS_STD);
+       if (!TRAJ_SUCCESS(err))
+               goto fail;
+
+       strat_set_speed(SPEED_DIST_SLOW, SPEED_ANGLE_SLOW);
+       trajectory_goto_forward_xy_abs(&mainboard.traj, 2750, COLOR_Y(250));
+       err = wait_traj_end(TRAJ_FLAGS_NO_NEAR);
+       if (!TRAJ_SUCCESS(err))
+               goto fail;
+
+       err = run_to_the_hills(get_opponent_color());
+
+ fail:
+       strat_want_pack = 0;
+       return err;
+}
+
 /* get tomatoes near our goals (12,5 and 12,3) */
 uint8_t get_orphan_tomatoes(void)
 {
 #define CLITOID_TOMATO_RADIUS 100.
-#define TOMATO_BACK_X 2760
+#define TOMATO_BACK_X 2780
 #define TOMATO_BACK_LEN 200
 
        int16_t x, y, a;
@@ -569,7 +747,7 @@ uint8_t get_orphan_tomatoes(void)
        x = position_get_x_s16(&mainboard.pos);
        y = position_get_y_s16(&mainboard.pos);
 
-       if (xycoord_to_ijcoord(&x, &y, &i, &j) < 0)
+       if (xycoord_to_ijcoord_not_corn(&x, &y, &i, &j) < 0)
                return END_ERROR;
 
        /* not on eject point */
@@ -602,19 +780,12 @@ uint8_t get_orphan_tomatoes(void)
        if (ABS(a) < 10)
                strat_reset_pos(AREA_X - ROBOT_HALF_LENGTH_FRONT,
                                DO_NOT_SET_POS,
-                               COLOR_A(0));
+                               COLOR_A(0) + ROBOT_ANGLE_FRONT);
 
        strat_set_speed(SPEED_CLITOID_FAST, SPEED_ANGLE_FAST);
        trajectory_d_rel(&mainboard.traj, -250);
        err = WAIT_COND_OR_TRAJ_END(!x_is_more_than(TOMATO_BACK_X),
                                    TRAJ_FLAGS_NO_NEAR);
-#ifdef HOST_VERSION /* simulator sees 2 blockings */
-       if (err == END_BLOCKING) {
-               trajectory_d_rel(&mainboard.traj, -250);
-               err = WAIT_COND_OR_TRAJ_END(!x_is_more_than(TOMATO_BACK_X),
-                                           TRAJ_FLAGS_NO_NEAR);
-       }
-#endif
 
        if (err != 0 && !TRAJ_SUCCESS(err))
                goto fail;
@@ -650,97 +821,213 @@ fail:
        return err;
 }
 
-/* get oranges, must be called near game area */
-uint8_t run_to_the_hills(uint8_t orange_color)
-{
-#define HILL_LEN 500
-#define HILL_POSY_YELLOW 300
-#define HILL_POSY_BLUE 200
-#define HILL_POSX_BALLS_DOWN 900
-#define HILL_START_POSX 580
 
-       double aa, ad;
-       uint16_t sa, sd;
-       uint8_t err;
-       uint8_t our_color = get_color();
-       int16_t startx, starty;
+#define HILL_LEN 1000
 
-       strat_want_pack = 1;
-       strat_get_acc(&ad, &aa);
-       strat_get_speed(&sd, &sa);
+#define HILL_ANGLE 0
+#define HILL_POSY_YELLOW 310
+#define HILL_POSY_BLUE 190
 
-       DEBUG(E_USER_STRAT, "%s()", __FUNCTION__);
+#define HILL_POSX_BALLS_DOWN1 830
+#define HILL_POSX_BALLS_DOWN2 920
+#define HILL_POSX_BALLS_DOWN3 730
+#define HILL_START_POSX 580
 
-       strat_set_speed(SPEED_DIST_FAST, SPEED_ANGLE_FAST);
+uint8_t prepare_hill(uint8_t orange_color, int16_t posx)
+{
+       int16_t startx, starty;
+       uint8_t our_color = get_color();
+       uint8_t err;
+
+       strat_set_speed(SPEED_DIST_SLOW, SPEED_ANGLE_SLOW);
        if (orange_color == I2C_COLOR_YELLOW)
                starty = HILL_POSY_YELLOW;
        else
                starty = HILL_POSY_BLUE;
        if (orange_color == our_color)
-               startx = HILL_START_POSX;
+               startx = posx;
        else
-               startx = AREA_X - HILL_START_POSX;
-       trajectory_goto_xy_abs(&mainboard.traj, startx, COLOR_Y(starty));
+               startx = AREA_X - posx;
+       trajectory_goto_forward_xy_abs(&mainboard.traj, startx, COLOR_Y(starty));
        err = wait_traj_end(TRAJ_FLAGS_SMALL_DIST);
+       if (!TRAJ_SUCCESS(err))
+               return err;
 
        /* turn to the hills */
        if (orange_color == our_color)
-               trajectory_a_abs(&mainboard.traj, COLOR_A(0));
+               trajectory_a_abs(&mainboard.traj, COLOR_A(HILL_ANGLE));
        else
-               trajectory_a_abs(&mainboard.traj, COLOR_A(180));
+               trajectory_a_abs(&mainboard.traj, COLOR_A(-180+HILL_ANGLE));
        err = wait_traj_end(TRAJ_FLAGS_SMALL_DIST);
+       if (!TRAJ_SUCCESS(err))
+               return err;
 
-       strat_set_acc(3, 3);
-       strat_set_speed(300, 500);
-       bd_set_current_thresholds(&mainboard.distance.bd, 500, 8000, 2000000, 40);
+       return END_TRAJ;
+}
+
+/* get oranges, must be called near game area */
+uint8_t run_to_the_hills(uint8_t orange_color)
+{
+       double aa, ad;
+       uint16_t sa, sd;
+       uint8_t err;
+       uint8_t our_color = get_color();
+       int32_t p = pid_get_gain_P(&mainboard.angle.pid);
+       int32_t i = pid_get_gain_I(&mainboard.angle.pid);
+       int32_t d = pid_get_gain_D(&mainboard.angle.pid);
+       int32_t max_in = pid_get_max_in(&mainboard.angle.pid);
+       int32_t max_i = pid_get_max_I(&mainboard.angle.pid);
+       int32_t max_out = pid_get_max_out(&mainboard.angle.pid);
+
+       strat_want_pack = 1;
+       strat_get_acc(&ad, &aa);
+       strat_get_speed(&sd, &sa);
+
+       DEBUG(E_USER_STRAT, "%s()", __FUNCTION__);
+
+       strat_set_speed(SPEED_DIST_FAST, SPEED_ANGLE_FAST);
+       err = prepare_hill(orange_color, HILL_START_POSX);
+       if (!TRAJ_SUCCESS(err))
+               return err;
+
+       strat_set_acc(5, ACC_ANGLE);
+       strat_set_speed(300, SPEED_ANGLE_SLOW);
+       bd_set_current_thresholds(&mainboard.distance.bd, 500, 8000, 2000000, 80);
+       bd_set_current_thresholds(&mainboard.angle.bd, 500, 8000, 2000000, 80);
+       bd_set_speed_threshold(&mainboard.distance.bd, 10);
        support_balls_pack();
 
+       /* decrease angle gains */
+       pid_set_gains(&mainboard.angle.pid, 200, 0, 2000);
+
        /* here it is difficult to handle return values, because we
         * are on the hill */
+       i2c_cobboard_set_mode(I2C_COBBOARD_MODE_KICKSTAND_DOWN);
        trajectory_d_rel(&mainboard.traj, HILL_LEN);
-       err = WAIT_COND_OR_TRAJ_END(position_get_x_s16(&mainboard.pos) > HILL_POSX_BALLS_DOWN,
-                                   TRAJ_FLAGS_NO_NEAR);
-       printf_P(PSTR("deploy\r\n"));
+       if (orange_color == our_color)
+               err = WAIT_COND_OR_TRAJ_END(position_get_x_s16(&mainboard.pos) >
+                                           HILL_POSX_BALLS_DOWN1,
+                                           TRAJ_FLAGS_SMALL_DIST);
+       else
+               err = WAIT_COND_OR_TRAJ_END(position_get_x_s16(&mainboard.pos) <
+                                           AREA_X - HILL_POSX_BALLS_DOWN1,
+                                           TRAJ_FLAGS_SMALL_DIST);
+       DEBUG(E_USER_STRAT, "deploy support balls");
+       i2c_ballboard_set_mode(I2C_BALLBOARD_MODE_PREP_FORK);
        support_balls_deploy();
-       i2c_cobboard_set_mode(I2C_COBBOARD_MODE_KICKSTAND);
-       err = wait_traj_end(TRAJ_FLAGS_NO_NEAR);
+       i2c_cobboard_set_mode(I2C_COBBOARD_MODE_KICKSTAND_UP);
+       trajectory_only_a_rel(&mainboard.traj, 2);
+       err = WAIT_COND_OR_TE_TO(0, 0, 2200);
 
-       time_wait_ms(2000);
+       i2c_cobboard_set_mode(I2C_COBBOARD_MODE_KICKSTAND_DOWN);
+       strat_set_acc(3, 3);
+       strat_hardstop();
+       i2c_ballboard_set_mode(I2C_BALLBOARD_MODE_TAKE_FORK);
+
+       time_wait_ms(500);
+
+       trajectory_d_rel(&mainboard.traj, 15);
+       time_wait_ms(700);
+       strat_hardstop();
+       time_wait_ms(200);
 
        /* reach top, go down */
-       trajectory_d_rel(&mainboard.traj, -HILL_LEN);
+       trajectory_d_a_rel(&mainboard.traj, -HILL_LEN, -2);
 
-       err = WAIT_COND_OR_TRAJ_END(position_get_x_s16(&mainboard.pos) < HILL_POSX_BALLS_DOWN,
-                                   TRAJ_FLAGS_NO_NEAR);
-       printf_P(PSTR("pack\r\n"));
+       if (orange_color == our_color)
+               err = WAIT_COND_OR_TRAJ_END(position_get_x_s16(&mainboard.pos) <
+                                           HILL_POSX_BALLS_DOWN2,
+                                           TRAJ_FLAGS_SMALL_DIST);
+       else
+               err = WAIT_COND_OR_TRAJ_END(position_get_x_s16(&mainboard.pos) >
+                                           AREA_X - HILL_POSX_BALLS_DOWN2,
+                                           TRAJ_FLAGS_SMALL_DIST);
+       DEBUG(E_USER_STRAT, "pack support balls");
        support_balls_pack();
-       err = wait_traj_end(TRAJ_FLAGS_NO_NEAR);
-       printf_P(PSTR("deploy\r\n"));
+       if (orange_color == our_color)
+               err = WAIT_COND_OR_TRAJ_END(position_get_x_s16(&mainboard.pos) <
+                                           HILL_POSX_BALLS_DOWN3,
+                                           TRAJ_FLAGS_SMALL_DIST);
+       else
+               err = WAIT_COND_OR_TRAJ_END(position_get_x_s16(&mainboard.pos) >
+                                           AREA_X - HILL_POSX_BALLS_DOWN3,
+                                           TRAJ_FLAGS_SMALL_DIST);
+
+       DEBUG(E_USER_STRAT, "deploy support balls");
        support_balls_deploy();
 
+       if (orange_color == I2C_COLOR_YELLOW) {
+               strat_set_acc(ad, aa);
+               strat_set_speed(SPEED_DIST_FAST, SPEED_ANGLE_FAST);
+       }
+       else {
+               strat_set_acc(ad, 0.4);
+               strat_set_speed(SPEED_DIST_SLOW, SPEED_ANGLE_SLOW);
+               trajectory_d_a_rel(&mainboard.traj, -500, 20);
+       }
+
+       /* wait to be near the wall */
+       if (orange_color == our_color)
+               err = WAIT_COND_OR_TRAJ_END(position_get_x_s16(&mainboard.pos) < 300,
+                                           TRAJ_FLAGS_SMALL_DIST);
+       else
+               err = WAIT_COND_OR_TRAJ_END(position_get_x_s16(&mainboard.pos) >
+                                           AREA_X - 300,
+                                           TRAJ_FLAGS_SMALL_DIST);
+
+       strat_set_acc(ad, aa);
+       strat_set_speed(SPEED_DIST_FAST, SPEED_ANGLE_FAST);
+
+       /* restore BD coefs */
+       bd_set_current_thresholds(&mainboard.distance.bd, 500, 8000, 1000000, 20);
+       bd_set_current_thresholds(&mainboard.distance.bd, 500, 8000, 1000000, 20);
+       bd_set_speed_threshold(&mainboard.distance.bd, 60);
+
        /* calibrate position on the wall */
+       strat_set_speed(SPEED_DIST_VERY_SLOW, SPEED_ANGLE_SLOW);
+
+       i2c_cobboard_set_mode(I2C_COBBOARD_MODE_HARVEST);
+
+       trajectory_a_abs(&mainboard.traj, COLOR_A(-90));
+       err = wait_traj_end(TRAJ_FLAGS_NO_NEAR);
+       time_wait_ms(200);
+
+       err = strat_calib(400, TRAJ_FLAGS_SMALL_DIST);
+       strat_reset_pos(DO_NOT_SET_POS,
+                       COLOR_Y(ROBOT_HALF_LENGTH_FRONT),
+                       COLOR_A(-90) + ROBOT_ANGLE_FRONT);
        strat_set_speed(SPEED_DIST_FAST, SPEED_ANGLE_FAST);
-       strat_set_acc(ad, aa);
-       trajectory_goto_xy_abs(&mainboard.traj, 150, COLOR_Y(starty));
-       err = WAIT_COND_OR_TRAJ_END(position_get_x_s16(&mainboard.pos) < 300,
-                                   TRAJ_FLAGS_NO_NEAR);
+
+       trajectory_d_rel(&mainboard.traj, -250);
+       err = wait_traj_end(TRAJ_FLAGS_NO_NEAR);
+#if 0
+       if (orange_color == our_color)
+               trajectory_a_abs(&mainboard.traj, 180);
+       else
+               trajectory_a_abs(&mainboard.traj, 0);
+       err = wait_traj_end(TRAJ_FLAGS_NO_NEAR);
+       time_wait_ms(200);
+
        strat_set_speed(SPEED_DIST_VERY_SLOW, SPEED_ANGLE_FAST);
-       err = strat_calib(-300, TRAJ_FLAGS_NO_NEAR);
+       err = strat_calib(400, TRAJ_FLAGS_SMALL_DIST);
        if (orange_color == our_color)
-               position_set(&mainboard.pos, ROBOT_HALF_LENGTH_REAR,
-                            DO_NOT_SET_POS, COLOR_A(0));
+               strat_reset_pos(ROBOT_HALF_LENGTH_FRONT,
+                               DO_NOT_SET_POS,
+                               180 + ROBOT_ANGLE_FRONT);
        else
-               position_set(&mainboard.pos, AREA_X - ROBOT_HALF_LENGTH_REAR,
-                            DO_NOT_SET_POS, COLOR_A(180));
+               strat_reset_pos(AREA_X - ROBOT_HALF_LENGTH_FRONT,
+                               DO_NOT_SET_POS,
+                               0 + ROBOT_ANGLE_FRONT);
        strat_set_speed(SPEED_DIST_FAST, SPEED_ANGLE_FAST);
-       trajectory_goto_xy_abs(&mainboard.traj, 150, COLOR_Y(starty));
-       err = wait_traj_end(TRAJ_FLAGS_STD);
 
+       trajectory_d_rel(&mainboard.traj, -250);
+       err = wait_traj_end(TRAJ_FLAGS_NO_NEAR);
+#endif
        /* revert acceleration and speed */
-       i2c_cobboard_set_mode(I2C_COBBOARD_MODE_HARVEST);
+       pid_set_gains(&mainboard.angle.pid, p, i, d);
+       pid_set_maximums(&mainboard.distance.pid, max_in, max_i, max_out);
        strat_want_pack = 0;
        strat_set_speed(sd, sa);
-       bd_set_current_thresholds(&mainboard.distance.bd, 500, 8000, 1000000, 20);
        support_balls_deploy();
        return err;
 }
@@ -752,11 +1039,15 @@ uint8_t strat_main(void)
        /* get oranges */
        if (strat_conf.flags & STRAT_CONF_OUR_ORANGE) {
                err = run_to_the_hills(get_color());
+               strat_db.our_oranges_count = 0;
                do_initturn = 0;
        }
 
        /* harvest the first cobs + balls */
-       err = strat_beginning(do_initturn);
+       if (strat_conf.flags & STRAT_CONF_STRAIGHT_BEGIN)
+               err = strat_beginning2(do_initturn);
+       else
+               err = strat_beginning(do_initturn);
 
        if (!TRAJ_SUCCESS(err))
                strat_unblock();
@@ -787,6 +1078,25 @@ uint8_t strat_main(void)
                        }
                }
 
+               /* if it's time to get opponent oranges, do it */
+               if (time_get_s() > strat_conf.opp_orange) {
+                       err = get_opp_oranges();
+                       if (err == END_ERROR) {
+                               DEBUG(E_USER_STRAT,
+                                     "get_opp_oranges returned END_ERROR");
+                       }
+                       else if (err == END_TIMER) {
+                               DEBUG(E_USER_STRAT, "End of time");
+                               strat_exit();
+                               break;
+                       }
+                       else if (!TRAJ_SUCCESS(err)) {
+                               /* don't retry oranges if it failed */
+                               strat_conf.opp_orange = 90;
+                               strat_unblock();
+                       }
+               }
+
                /**********************/
                /* harvest on circuit */
                /**********************/