From 25afe92f4ecf738de89e30cedb9ba7a1553c3bb8 Mon Sep 17 00:00:00 2001 From: Julien Balleyguier Date: Thu, 17 May 2012 00:55:41 +0200 Subject: digital/io-hub/src/guybrush: fixing the calm_clamp_down bug --- digital/io-hub/src/guybrush/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'digital') diff --git a/digital/io-hub/src/guybrush/main.c b/digital/io-hub/src/guybrush/main.c index 20548d16..556be296 100644 --- a/digital/io-hub/src/guybrush/main.c +++ b/digital/io-hub/src/guybrush/main.c @@ -231,8 +231,8 @@ main_event_to_fsm (void) FSM_HANDLE_E (AI, lower_clamp_rotation_success); else if (mimot_motor0_status == failure) FSM_HANDLE_E (AI, lower_clamp_rotation_failure); - if (IO_GET (CONTACT_LOWER_CLAMP_SENSOR_1) - || IO_GET (CONTACT_LOWER_CLAMP_SENSOR_2)) + if ((IO_GET (CONTACT_LOWER_CLAMP_SENSOR_1) + || IO_GET (CONTACT_LOWER_CLAMP_SENSOR_2)) && (!clamp_calm_mode_read())) FSM_HANDLE_E (AI, coin_detected); if ((int16_t) (mimot_get_motor0_position() - position_to_drop) > 0) FSM_HANDLE_E (AI, time_to_drop_coin); -- cgit v1.2.3