From 032cdc6525dad927c2f19d4b027588afe1bc0e27 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Wed, 16 May 2012 22:26:06 +0200 Subject: digital/io-hub/src/guybrush: add nb robots switch --- digital/io-hub/src/guybrush/contact_defs.h | 4 +++- eurobot/2012/io-hub-cabling.svg | 18 ++++++++++++++---- host/simu/robots/guybrush/link/bag.py | 2 +- host/simu/robots/guybrush/model/bag.py | 3 ++- host/simu/robots/guybrush/view/bag.py | 2 ++ 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/digital/io-hub/src/guybrush/contact_defs.h b/digital/io-hub/src/guybrush/contact_defs.h index e28e7b1a..cd922ea2 100644 --- a/digital/io-hub/src/guybrush/contact_defs.h +++ b/digital/io-hub/src/guybrush/contact_defs.h @@ -37,6 +37,7 @@ #define CONTACT_GOLD_BAR E, 6 #define CONTACT_TOTEM E, 7 #define CONTACT_LOWER_CLAMP_ZERO D, 7 +#define CONTACT_NB_ROBOTS A, 6 #define CONTACT_LIST \ CONTACT (CONTACT_STRAT, 1) \ @@ -48,6 +49,7 @@ CONTACT (CONTACT_DOOR_CLOSE, 1) \ CONTACT (CONTACT_GOLD_BAR, 1) \ CONTACT (CONTACT_TOTEM, 1) \ - CONTACT (CONTACT_LOWER_CLAMP_ZERO, 0) + CONTACT (CONTACT_LOWER_CLAMP_ZERO, 0) \ + CONTACT (CONTACT_NB_ROBOTS, 1) #endif /* contact_defs_h */ diff --git a/eurobot/2012/io-hub-cabling.svg b/eurobot/2012/io-hub-cabling.svg index 20e90fbe..ad0f6e38 100644 --- a/eurobot/2012/io-hub-cabling.svg +++ b/eurobot/2012/io-hub-cabling.svg @@ -42,11 +42,11 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.67057292" - inkscape:cx="512" - inkscape:cy="384" + inkscape:zoom="1.8966666" + inkscape:cx="376.47864" + inkscape:cy="413.99372" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="g3102" showgrid="true" inkscape:window-width="1366" inkscape:window-height="756" @@ -561,6 +561,16 @@ x="319.57224" id="tspan3057" sodipodi:role="line">strategy switch + 1/2 robot switch