summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--digital/io-hub/src/apbirthday/hardware.hh3
-rw-r--r--digital/io-hub/src/apbirthday/hardware.host.cc2
-rw-r--r--digital/io-hub/src/apbirthday/hardware.stm32.cc2
-rw-r--r--eurobot/2013/io-hub-stm32-connectors.odsbin21841 -> 21859 bytes
-rw-r--r--host/simu/robots/apbirthday/link/bag.py1
5 files changed, 7 insertions, 1 deletions
diff --git a/digital/io-hub/src/apbirthday/hardware.hh b/digital/io-hub/src/apbirthday/hardware.hh
index ae60afaa..148d0727 100644
--- a/digital/io-hub/src/apbirthday/hardware.hh
+++ b/digital/io-hub/src/apbirthday/hardware.hh
@@ -64,7 +64,8 @@ struct Hardware
ihm_lol,
ihm_emerg_stop;
ucoo::Gpio
- glass_contact;
+ glass_contact,
+ cherry_plate_left_contact, cherry_plate_right_contact;
ucoo::Gpio
cherry_bad_out, cherry_bad_in,
cherry_plate_up, cherry_plate_down,
diff --git a/digital/io-hub/src/apbirthday/hardware.host.cc b/digital/io-hub/src/apbirthday/hardware.host.cc
index 3eee4294..a4210480 100644
--- a/digital/io-hub/src/apbirthday/hardware.host.cc
+++ b/digital/io-hub/src/apbirthday/hardware.host.cc
@@ -38,6 +38,8 @@ Hardware::Hardware ()
ihm_lol (host, "ihm_lol"),
ihm_emerg_stop (host, "ihm_emerg_stop"),
glass_contact (host, "glass_contact"),
+ cherry_plate_left_contact (host, "cherry_plate_left_contact"),
+ cherry_plate_right_contact (host, "cherry_plate_right_contact"),
cherry_bad_out (host, "cherry_bad_out"),
cherry_bad_in (host, "cherry_bad_in"),
cherry_plate_up (host, "cherry_plate_up"),
diff --git a/digital/io-hub/src/apbirthday/hardware.stm32.cc b/digital/io-hub/src/apbirthday/hardware.stm32.cc
index 9bc7984e..be83905c 100644
--- a/digital/io-hub/src/apbirthday/hardware.stm32.cc
+++ b/digital/io-hub/src/apbirthday/hardware.stm32.cc
@@ -37,6 +37,8 @@ Hardware::Hardware ()
ihm_lol (GPIOD, 11),
ihm_emerg_stop (GPIOC, 6),
glass_contact (GPIOC, 13),
+ cherry_plate_left_contact (GPIOE, 5),
+ cherry_plate_right_contact (GPIOE, 6),
cherry_bad_out (GPIOE, 0), cherry_bad_in (GPIOE, 1),
cherry_plate_up (GPIOE, 2), cherry_plate_down (GPIOE, 3),
cherry_plate_clamp (GPIOE, 4),
diff --git a/eurobot/2013/io-hub-stm32-connectors.ods b/eurobot/2013/io-hub-stm32-connectors.ods
index 06d90278..beab53a7 100644
--- a/eurobot/2013/io-hub-stm32-connectors.ods
+++ b/eurobot/2013/io-hub-stm32-connectors.ods
Binary files differ
diff --git a/host/simu/robots/apbirthday/link/bag.py b/host/simu/robots/apbirthday/link/bag.py
index 8d3971d5..bc81b694 100644
--- a/host/simu/robots/apbirthday/link/bag.py
+++ b/host/simu/robots/apbirthday/link/bag.py
@@ -34,6 +34,7 @@ class Bag:
self.io_hub = io_hub.mex.Mex (node, '%s:io0' % instance, gpios = True)
gpios = ('raw_jack', 'ihm_color', 'ihm_strat', 'ihm_robot_nb',
'ihm_lol', 'ihm_emerg_stop', 'glass_contact',
+ 'cherry_plate_left_contact', 'cherry_plate_right_contact',
'cherry_bad_out', 'cherry_bad_in', 'cherry_plate_up',
'cherry_plate_down', 'cherry_plate_clamp', 'cake_arm_out',
'cake_arm_in', 'cake_push_far_out', 'cake_push_far_in',