X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fstrat.c;fp=projects%2Fmicrob2010%2Fmainboard%2Fstrat.c;h=7f7b9d908a3ee20261b1c510dd3970e0fa259f15;hp=64562f530c77ebc69a50f448ea6989ed486c1b56;hb=d78a81c0df6dfe318d873a6f877e53cfb957ad8e;hpb=f1fab48d45873bc23dccbae5db393afd2942570c diff --git a/projects/microb2010/mainboard/strat.c b/projects/microb2010/mainboard/strat.c index 64562f5..7f7b9d9 100644 --- a/projects/microb2010/mainboard/strat.c +++ b/projects/microb2010/mainboard/strat.c @@ -501,6 +501,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)) @@ -517,6 +518,10 @@ static uint8_t strat_eject(void) 2000); #endif } + else { + /* to pack spickles */ + time_wait_ms(300); + } if (get_cob_count() > 0) { /* half turn */ @@ -904,7 +909,12 @@ uint8_t run_to_the_hills(uint8_t orange_color) strat_hardstop(); i2c_ballboard_set_mode(I2C_BALLBOARD_MODE_TAKE_FORK); - time_wait_ms(1800); + time_wait_ms(1100); + + trajectory_d_rel(&mainboard.traj, 15); + time_wait_ms(400); + strat_hardstop(); + time_wait_ms(200); /* reach top, go down */ trajectory_d_rel(&mainboard.traj, -HILL_LEN);