git.droids-corp.org
/
aversive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strat db
[aversive.git]
/
projects
/
microb2010
/
mainboard
/
strat_corn.h
diff --git
a/projects/microb2010/mainboard/strat_corn.h
b/projects/microb2010/mainboard/strat_corn.h
index
def2237
..
ca4a7d6
100644
(file)
--- a/
projects/microb2010/mainboard/strat_corn.h
+++ b/
projects/microb2010/mainboard/strat_corn.h
@@
-20,15
+20,6
@@
* Olivier MATZ <zer0@droids-corp.org>
*/
* Olivier MATZ <zer0@droids-corp.org>
*/
-#define CORN_NB 18
-
-/* enum is better */
-#define TYPE_WAYPOINT 0
-#define TYPE_DANGEROUS 1
-#define TYPE_WHITE_CORN 2
-#define TYPE_BLACK_CORN 3
-#define TYPE_OBSTACLE 4
-
#define LINE_UP 0
#define LINE_DOWN 1
#define LINE_R_UP 2
#define LINE_UP 0
#define LINE_DOWN 1
#define LINE_R_UP 2
@@
-41,12
+32,7
@@
struct line_2pts {
point_t p2;
};
point_t p2;
};
-extern uint8_t corn_table[CORN_NB];
-
-int8_t ijcoord_to_corn_idx(uint8_t i, uint8_t j);
-int8_t xycoord_to_corn_idx(int16_t *x, int16_t *y);
-void init_corn_table(int8_t conf_side, int8_t conf_center);
+void num2line(struct line_2pts *l, uint8_t dir, uint8_t num);
uint8_t line2line(uint8_t dir1, uint8_t num1,
uint8_t dir2, uint8_t num2);
uint8_t line2line(uint8_t dir1, uint8_t num1,
uint8_t dir2, uint8_t num2);
-void num2line(struct line_2pts *l, uint8_t dir, uint8_t num);