From bff1fca84d0a1af55ab79f34cec6d0326d5f6ee6 Mon Sep 17 00:00:00 2001 From: Jérémy Dufour Date: Sun, 20 Apr 2008 16:04:02 +0200 Subject: * digital/io/src - fix order in defines (do the division at the end) ; - fix angle defines. --- digital/io/src/giboulee.h | 4 ++-- digital/io/src/playground.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/digital/io/src/giboulee.h b/digital/io/src/giboulee.h index 2e0ce762..d8f93ef0 100644 --- a/digital/io/src/giboulee.h +++ b/digital/io/src/giboulee.h @@ -52,13 +52,13 @@ * it. * For the moment, 15% of a complete turn */ -#define BOT_ARM_MIN_TO_OPEN (BOT_ARM_STEP_ROUND / 100 * 15) +#define BOT_ARM_MIN_TO_OPEN (BOT_ARM_STEP_ROUND * 15L / 100) /** * Steps number relative to the beginning of a third round for the 'noted' * position required by the get sample FSM. */ -#define BOT_ARM_NOTED_POSITION (BOT_ARM_THIRD_ROUND / 3 * 2) +#define BOT_ARM_NOTED_POSITION (BOT_ARM_THIRD_ROUND * 2 / 3) /** * How to compute a angle for giboulee? diff --git a/digital/io/src/playground.h b/digital/io/src/playground.h index 992425ce..95f7aad3 100644 --- a/digital/io/src/playground.h +++ b/digital/io/src/playground.h @@ -65,7 +65,7 @@ */ #define PG_X_START (PG_X_VALUE_COMPUTING (200)) #define PG_Y_START (PG_HEIGHT - 70) -#define PG_A_START (BOT_ANGLE_DEGREE * 90) +#define PG_A_START (-90 * BOT_ANGLE_DEGREE) /** * The distance to remove from the real position of the distributor before @@ -81,7 +81,7 @@ (PG_X_VALUE_COMPUTING (0 + PG_DISTANCE_DISTRIBUTOR)) #define PG_DISTRIBUTOR_ICE_OUR_Y 1350 #define PG_DISTRIBUTOR_ICE_OUR_A \ - (PG_A_VALUE_COMPUTING (BOT_ANGLE_DEGREE * 180)) + (PG_A_VALUE_COMPUTING (180 * BOT_ANGLE_DEGREE)) /** * The position of adverse ice distributor minus the distance to remove (only @@ -100,13 +100,13 @@ #define PG_DISTRIBUTOR_SAMPLE_OUR_X \ (PG_X_VALUE_COMPUTING (700)) #define PG_DISTRIBUTOR_SAMPLE_OUR_Y (PG_HEIGHT - PG_DISTANCE_DISTRIBUTOR) -#define PG_DISTRIBUTOR_SAMPLE_OUR_A (BOT_ANGLE_DEGREE * 270) +#define PG_DISTRIBUTOR_SAMPLE_OUR_A (90 * BOT_ANGLE_DEGREE) /** * The position of the gutter. */ #define PG_GUTTER_X (PG_X_VALUE_COMPUTING (2250)) #define PG_GUTTER_Y (100) -#define PG_GUTTER_A (BOT_ANGLE_DEGREE * 90) +#define PG_GUTTER_A (-90 * BOT_ANGLE_DEGREE) #endif // playground_h -- cgit v1.2.3