From acd8e0eefa259500bf1325fa6b84c3b615d00782 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sat, 5 May 2012 16:31:07 +0200 Subject: digital/io-hub/src/guybrush: add totem defines --- digital/io-hub/src/guybrush/path.c | 14 +++++++------- digital/io-hub/src/guybrush/playground_2012.h | 5 +++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/digital/io-hub/src/guybrush/path.c b/digital/io-hub/src/guybrush/path.c index d7f8b74c..52dcd1d1 100644 --- a/digital/io-hub/src/guybrush/path.c +++ b/digital/io-hub/src/guybrush/path.c @@ -136,19 +136,19 @@ static const struct path_node_t path_nodes[PATH_FIXED_NODES_NB] = { /** X position of columns. */ static const uint16_t path_nodes_x[PATH_COLUMNS_NB] = { - PG_WIDTH / 2 - PG_TOTEM_X_OFFSET_MM - PATH_TOTEM_CLEAR_MM, - PG_WIDTH / 2 - PG_TOTEM_X_OFFSET_MM, + PG_TOTEM_LEFT_X - PATH_TOTEM_CLEAR_MM, + PG_TOTEM_LEFT_X, PG_WIDTH / 2, - PG_WIDTH / 2 + PG_TOTEM_X_OFFSET_MM, - PG_WIDTH / 2 + PG_TOTEM_X_OFFSET_MM + PATH_TOTEM_CLEAR_MM, + PG_TOTEM_RIGHT_X, + PG_TOTEM_RIGHT_X + PATH_TOTEM_CLEAR_MM, }; /** Y position of lines. */ static const uint16_t path_nodes_y[PATH_COLUMN_NODES_NB] = { PATH_GRID_CLEARANCE_MM, - PG_LENGTH / 2 - PATH_TOTEM_CLEAR_MM, - PG_LENGTH / 2, - PG_LENGTH / 2 + PATH_TOTEM_CLEAR_MM, + PG_TOTEM_Y - PATH_TOTEM_CLEAR_MM, + PG_TOTEM_Y, + PG_TOTEM_Y + PATH_TOTEM_CLEAR_MM, PG_LENGTH - PATH_GRID_CLEARANCE_MM, }; diff --git a/digital/io-hub/src/guybrush/playground_2012.h b/digital/io-hub/src/guybrush/playground_2012.h index f05801c3..d96d8cca 100644 --- a/digital/io-hub/src/guybrush/playground_2012.h +++ b/digital/io-hub/src/guybrush/playground_2012.h @@ -35,4 +35,9 @@ /** Totem width. */ #define PG_TOTEM_WIDTH_MM 250 +/** Totems position. */ +#define PG_TOTEM_LEFT_X (PG_WIDTH / 2 - PG_TOTEM_X_OFFSET_MM) +#define PG_TOTEM_RIGHT_X (PG_WIDTH / 2 + PG_TOTEM_X_OFFSET_MM) +#define PG_TOTEM_Y (PG_LENGTH / 2) + #endif /* playground_2012_h */ -- cgit v1.2.3