From 261a73fe703333984c4bc22ce6cbd108f86058ca Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sun, 7 Apr 2013 15:44:30 +0200 Subject: digital/io-hub/src/apbirthday: fix added contacts - move contact to input group, - fix STM32 port name and number, - add missing declaration in python module, - bold IO in spreadsheet. --- digital/io-hub/src/apbirthday/hardware.hh | 4 ++-- digital/io-hub/src/apbirthday/hardware.host.cc | 4 ++-- digital/io-hub/src/apbirthday/hardware.stm32.cc | 2 +- digital/io-hub/tools/io_hub/apbirthday.py | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'digital') diff --git a/digital/io-hub/src/apbirthday/hardware.hh b/digital/io-hub/src/apbirthday/hardware.hh index eeb00545..44ded0df 100644 --- a/digital/io-hub/src/apbirthday/hardware.hh +++ b/digital/io-hub/src/apbirthday/hardware.hh @@ -72,13 +72,13 @@ struct Hardware ihm_emerg_stop; ucoo::Gpio glass_contact, - cherry_plate_left_contact, cherry_plate_right_contact; + cherry_plate_left_contact, cherry_plate_right_contact, + cake_arm_out_contact, cake_arm_in_contact; ucoo::Gpio cherry_bad_out, cherry_bad_in, cherry_plate_up, cherry_plate_down, cherry_plate_clamp, cake_arm_out, cake_arm_in, - cake_arm_out_contact, cake_arm_in_contact, cake_push_far_out, cake_push_far_in, cake_push_near_out, cake_push_near_in, glass_lower_clamp_close, glass_lower_clamp_open, diff --git a/digital/io-hub/src/apbirthday/hardware.host.cc b/digital/io-hub/src/apbirthday/hardware.host.cc index 35172d38..4226281f 100644 --- a/digital/io-hub/src/apbirthday/hardware.host.cc +++ b/digital/io-hub/src/apbirthday/hardware.host.cc @@ -41,6 +41,8 @@ Hardware::Hardware () glass_contact (host, "glass_contact"), cherry_plate_left_contact (host, "cherry_plate_left_contact"), cherry_plate_right_contact (host, "cherry_plate_right_contact"), + cake_arm_out_contact (host, "cake_arm_out_contact"), + cake_arm_in_contact (host, "cake_arm_in_contact"), cherry_bad_out (host, "cherry_bad_out"), cherry_bad_in (host, "cherry_bad_in"), cherry_plate_up (host, "cherry_plate_up"), @@ -48,8 +50,6 @@ Hardware::Hardware () cherry_plate_clamp (host, "cherry_plate_clamp"), cake_arm_out (host, "cake_arm_out"), cake_arm_in (host, "cake_arm_in"), - cake_arm_out_contact (host, "cake_arm_out_contact"), - cake_arm_in_contact (host, "cake_arm_in_contact"), cake_push_far_out (host, "cake_push_far_out"), cake_push_far_in (host, "cake_push_far_in"), cake_push_near_out (host, "cake_push_near_out"), diff --git a/digital/io-hub/src/apbirthday/hardware.stm32.cc b/digital/io-hub/src/apbirthday/hardware.stm32.cc index 9c70a1ad..572ea911 100644 --- a/digital/io-hub/src/apbirthday/hardware.stm32.cc +++ b/digital/io-hub/src/apbirthday/hardware.stm32.cc @@ -43,11 +43,11 @@ Hardware::Hardware () glass_contact (GPIOC, 13), cherry_plate_left_contact (GPIOE, 5), cherry_plate_right_contact (GPIOE, 6), + cake_arm_out_contact (GPIOC, 5), cake_arm_in_contact (GPIOB, 1), 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), cake_arm_out (GPIOB, 3), cake_arm_in (GPIOB, 4), - cake_arm_out_contact (GPIOB, 7), cake_arm_in_contact (GPIOB, 6), cake_push_far_out (GPIOD, 7), cake_push_far_in (GPIOB, 5), cake_push_near_out (GPIOD, 6), cake_push_near_in (GPIOB, 6), glass_lower_clamp_close (GPIOA, 15), glass_lower_clamp_open (GPIOA, 10), diff --git a/digital/io-hub/tools/io_hub/apbirthday.py b/digital/io-hub/tools/io_hub/apbirthday.py index 4e604c21..f23ba8bc 100644 --- a/digital/io-hub/tools/io_hub/apbirthday.py +++ b/digital/io-hub/tools/io_hub/apbirthday.py @@ -27,6 +27,7 @@ inputs = [ 'raw_jack', 'ihm_color', 'ihm_strat', 'ihm_robot_nb', 'ihm_lol', 'ihm_emerg_stop', 'glass_contact', 'cherry_plate_left_contact', 'cherry_plate_right_contact', + 'cake_arm_out_contact', 'cake_arm_in_contact', ] outputs = [ 'cherry_bad_out', 'cherry_bad_in', 'cherry_plate_up', -- cgit v1.2.3