X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fmainboard%2Fstrat_utils.h;h=7bb43a747cbd173ce91d79f3980f84449e3d4227;hp=7502a4355e8d70fbba17668cbe52e114ca3b697f;hb=4872fe91ffcc459a56e45cb213eec2a8660075e1;hpb=fa8546ea39c7442ad3bf5a822a72a2b50a41045d diff --git a/projects/microb2010/mainboard/strat_utils.h b/projects/microb2010/mainboard/strat_utils.h index 7502a43..7bb43a7 100644 --- a/projects/microb2010/mainboard/strat_utils.h +++ b/projects/microb2010/mainboard/strat_utils.h @@ -31,7 +31,7 @@ struct xy_point { ({ \ uint8_t __err = 0; \ while ( (! (cond)) && (__err == 0)) { \ - __err = test_traj_end(TRAJ_FLAGS_NO_NEAR); \ + __err = test_traj_end(mask); \ } \ __err; \ }) \ @@ -58,3 +58,6 @@ int8_t get_opponent_xy(int16_t *x, int16_t *y); int8_t get_opponent_da(int16_t *d, int16_t *a); int8_t get_opponent_xyda(int16_t *x, int16_t *y, int16_t *d, int16_t *a); uint8_t opponent_is_behind(void); + +uint8_t get_ball_count(void); +uint8_t get_cob_count(void);