summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--digital/ai/src/common/playground.h10
-rw-r--r--digital/io-hub/src/robospierre/clamp.c2
-rw-r--r--digital/io-hub/src/robospierre/element.c2
-rw-r--r--digital/io-hub/src/robospierre/init_defs.h2
-rw-r--r--digital/io-hub/src/robospierre/pawn_sensor.c2
-rw-r--r--digital/io-hub/src/robospierre/playground_2011.h2
-rw-r--r--digital/io-hub/src/robospierre/radar_defs.c2
-rw-r--r--digital/io/src/food.c2
-rw-r--r--digital/io/src/hola.c2
-rw-r--r--digital/io/src/init.c1
-rw-r--r--digital/io/src/move.c2
-rw-r--r--digital/io/src/path.c2
-rw-r--r--digital/io/src/playground_2010.h3
-rw-r--r--digital/io/src/top.c2
14 files changed, 24 insertions, 12 deletions
diff --git a/digital/ai/src/common/playground.h b/digital/ai/src/common/playground.h
index 18c81ecf..4f225a50 100644
--- a/digital/ai/src/common/playground.h
+++ b/digital/ai/src/common/playground.h
@@ -31,11 +31,19 @@
* angle depending of the current team color.
*/
+#ifndef EUROBOT
+# error "Need EUROBOT define for playground"
+#endif
+
/** Playground width, mm. */
#define PG_WIDTH 3000
/** Playground length, mm. */
-#define PG_LENGTH 2100
+#if EUROBOT >= 2012
+# define PG_LENGTH 2000
+#else
+# define PG_LENGTH 2100
+#endif
/** Distance to playground borders for general movements, mm. */
#define PG_BORDER_DISTANCE 250
diff --git a/digital/io-hub/src/robospierre/clamp.c b/digital/io-hub/src/robospierre/clamp.c
index 84b2771c..1f8c5072 100644
--- a/digital/io-hub/src/robospierre/clamp.c
+++ b/digital/io-hub/src/robospierre/clamp.c
@@ -30,7 +30,7 @@
#include "contact.h"
#include "bot.h"
#include "element.h"
-#include "playground.h"
+#include "playground_2011.h"
#define FSM_NAME AI
#include "fsm.h"
diff --git a/digital/io-hub/src/robospierre/element.c b/digital/io-hub/src/robospierre/element.c
index 881e1be6..6240666e 100644
--- a/digital/io-hub/src/robospierre/element.c
+++ b/digital/io-hub/src/robospierre/element.c
@@ -32,7 +32,7 @@
#include "chrono.h"
#include "logistic.h"
#include "bot.h"
-#include "playground.h"
+#include "playground_2011.h"
/** Offset to be used when everything fail. */
static uint8_t failure_offset_s;
diff --git a/digital/io-hub/src/robospierre/init_defs.h b/digital/io-hub/src/robospierre/init_defs.h
index 6ce6eaae..ecbc4f4c 100644
--- a/digital/io-hub/src/robospierre/init_defs.h
+++ b/digital/io-hub/src/robospierre/init_defs.h
@@ -25,7 +25,7 @@
*
* }}} */
-#include "playground.h"
+#include "playground_2011.h"
#include "bot.h"
/** Parameters to push the first wall. */
diff --git a/digital/io-hub/src/robospierre/pawn_sensor.c b/digital/io-hub/src/robospierre/pawn_sensor.c
index cc9e6900..5c2f2ece 100644
--- a/digital/io-hub/src/robospierre/pawn_sensor.c
+++ b/digital/io-hub/src/robospierre/pawn_sensor.c
@@ -32,7 +32,7 @@
#include "element.h"
#include "clamp.h"
#include "bot.h"
-#include "playground.h"
+#include "playground_2011.h"
#include "codebar.h"
#include "mimot.h"
#include "main.h"
diff --git a/digital/io-hub/src/robospierre/playground_2011.h b/digital/io-hub/src/robospierre/playground_2011.h
index a9963e34..97cf59f2 100644
--- a/digital/io-hub/src/robospierre/playground_2011.h
+++ b/digital/io-hub/src/robospierre/playground_2011.h
@@ -25,6 +25,8 @@
*
* }}} */
+#define EUROBOT 2011
+
#include "playground.h"
/** Width of a green zone. */
diff --git a/digital/io-hub/src/robospierre/radar_defs.c b/digital/io-hub/src/robospierre/radar_defs.c
index 85f015e1..778f2db1 100644
--- a/digital/io-hub/src/robospierre/radar_defs.c
+++ b/digital/io-hub/src/robospierre/radar_defs.c
@@ -26,7 +26,7 @@
#include "radar.h"
#include "modules/devices/usdist/usdist.h"
-#include "playground.h"
+#include "playground_2011.h"
/** Define radar configuration. */
struct radar_sensor_t radar_sensors[RADAR_SENSOR_NB] = {
diff --git a/digital/io/src/food.c b/digital/io/src/food.c
index 5db8b652..7e6b4f9b 100644
--- a/digital/io/src/food.c
+++ b/digital/io/src/food.c
@@ -26,7 +26,7 @@
#include "defs.h"
#include "food.h"
#include "bot.h"
-#include "playground.h"
+#include "playground_2010.h"
#include "modules/utils/utils.h"
#include "modules/math/geometry/distance.h"
diff --git a/digital/io/src/hola.c b/digital/io/src/hola.c
index c7d07e21..7c9d5184 100644
--- a/digital/io/src/hola.c
+++ b/digital/io/src/hola.c
@@ -30,7 +30,7 @@
#include "asserv.h"
#include "mimot.h"
#include "bot.h"
-#include "playground.h"
+#include "playground_2010.h"
#include "modules/math/fixed/fixed.h"
diff --git a/digital/io/src/init.c b/digital/io/src/init.c
index 58c94333..eda6435c 100644
--- a/digital/io/src/init.c
+++ b/digital/io/src/init.c
@@ -33,7 +33,6 @@
#include "bot.h"
#include "switch.h"
#include "chrono.h"
-#include "playground.h"
#include "modules/trace/trace.h"
#include "modules/path/path.h"
diff --git a/digital/io/src/move.c b/digital/io/src/move.c
index 81c554fc..a887e1b2 100644
--- a/digital/io/src/move.c
+++ b/digital/io/src/move.c
@@ -33,7 +33,7 @@
#include "asserv.h"
#include "main.h"
#include "events.h"
-#include "playground.h"
+#include "playground_2010.h"
#include "loader.h"
#include "modules/path/path.h"
#include "modules/utils/utils.h"
diff --git a/digital/io/src/path.c b/digital/io/src/path.c
index 01a82d11..ec2e1bb9 100644
--- a/digital/io/src/path.c
+++ b/digital/io/src/path.c
@@ -26,7 +26,7 @@
#include "defs.h"
#include "path.h"
#include "bot.h"
-#include "playground.h"
+#include "playground_2010.h"
#include "food.h"
diff --git a/digital/io/src/playground_2010.h b/digital/io/src/playground_2010.h
index 11682c5e..c3a843b3 100644
--- a/digital/io/src/playground_2010.h
+++ b/digital/io/src/playground_2010.h
@@ -24,6 +24,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* }}} */
+
+#define EUROBOT 2010
+
#include "playground.h"
/**
diff --git a/digital/io/src/top.c b/digital/io/src/top.c
index e899d718..23debf46 100644
--- a/digital/io/src/top.c
+++ b/digital/io/src/top.c
@@ -34,7 +34,7 @@
#include "loader.h"
#include "move.h"
#include "chrono.h"
-#include "playground.h"
+#include "playground_2010.h"
#include "bot.h"
#include "modules/utils/utils.h"