summaryrefslogtreecommitdiff
path: root/digital/io-hub
diff options
context:
space:
mode:
authorNicolas Schodet2011-05-22 17:21:56 +0200
committerNicolas Schodet2011-05-22 19:33:10 +0200
commit27700ff4b67d9e8351da875c6f4d58a8f1311e5d (patch)
tree93b15f5f6fd76b2d53b991ba82e996cf9f66cc72 /digital/io-hub
parent447138614e45686cff0bf55a351610c1c108168a (diff)
digital/io-hub: rename element to element_type where appropriated
Diffstat (limited to 'digital/io-hub')
-rw-r--r--digital/io-hub/src/robospierre/clamp.c16
-rw-r--r--digital/io-hub/src/robospierre/clamp.h2
-rw-r--r--digital/io-hub/src/robospierre/logistic.c4
-rw-r--r--digital/io-hub/src/robospierre/logistic.h2
4 files changed, 12 insertions, 12 deletions
diff --git a/digital/io-hub/src/robospierre/clamp.c b/digital/io-hub/src/robospierre/clamp.c
index b7c85250..50fcf041 100644
--- a/digital/io-hub/src/robospierre/clamp.c
+++ b/digital/io-hub/src/robospierre/clamp.c
@@ -117,8 +117,8 @@ struct clamp_t
uint8_t moving_to;
/** Position of a new element. */
uint8_t pos_new;
- /** New element kind. */
- uint8_t new_element;
+ /** New element type. */
+ uint8_t new_element_type;
/** Drop direction, drop on the other side. */
uint8_t drop_direction;
};
@@ -192,11 +192,11 @@ clamp_move_element (uint8_t from, uint8_t to)
}
void
-clamp_new_element (uint8_t pos, uint8_t element)
+clamp_new_element (uint8_t pos, uint8_t element_type)
{
assert (pos == CLAMP_SLOT_FRONT_BOTTOM || pos == CLAMP_SLOT_BACK_BOTTOM);
ctx.pos_new = pos;
- ctx.new_element = element;
+ ctx.new_element_type = element_type;
FSM_HANDLE (AI, clamp_new_element);
}
@@ -225,17 +225,17 @@ clamp_handle_event (void)
if (FSM_CAN_HANDLE (AI, clamp_new_element))
{
/* XXX: temporary hack. */
- uint8_t element = contact_get_color () ? ELEMENT_PAWN : ELEMENT_KING;
+ uint8_t element_type = contact_get_color () ? ELEMENT_PAWN : ELEMENT_KING;
if (!IO_GET (CONTACT_FRONT_BOTTOM)
&& !logistic_global.slots[CLAMP_SLOT_FRONT_BOTTOM])
{
- clamp_new_element (CLAMP_SLOT_FRONT_BOTTOM, element);
+ clamp_new_element (CLAMP_SLOT_FRONT_BOTTOM, element_type);
return 1;
}
if (!IO_GET (CONTACT_BACK_BOTTOM)
&& !logistic_global.slots[CLAMP_SLOT_BACK_BOTTOM])
{
- clamp_new_element (CLAMP_SLOT_BACK_BOTTOM, element);
+ clamp_new_element (CLAMP_SLOT_BACK_BOTTOM, element_type);
return 1;
}
}
@@ -356,7 +356,7 @@ FSM_TRANS_TIMEOUT (CLAMP_TAKING_DOOR_CLOSING, BOT_PWM_DOOR_CLOSE_TIME,
move_to_idle, CLAMP_GOING_IDLE,
done, CLAMP_IDLE)
{
- logistic_element_new (ctx.pos_new, ctx.new_element);
+ logistic_element_new (ctx.pos_new, ctx.new_element_type);
if (logistic_global.moving_from != CLAMP_SLOT_NB)
{
clamp_move_element (logistic_global.moving_from,
diff --git a/digital/io-hub/src/robospierre/clamp.h b/digital/io-hub/src/robospierre/clamp.h
index 64575508..7471ceac 100644
--- a/digital/io-hub/src/robospierre/clamp.h
+++ b/digital/io-hub/src/robospierre/clamp.h
@@ -70,7 +70,7 @@ clamp_move_element (uint8_t from, uint8_t to);
/** Simulate the presence of a new element. */
void
-clamp_new_element (uint8_t pos, uint8_t element);
+clamp_new_element (uint8_t pos, uint8_t element_type);
/** Drop an element tower. Return 0 if not currently possible. If
* drop_direction is forward, drop at the back. */
diff --git a/digital/io-hub/src/robospierre/logistic.c b/digital/io-hub/src/robospierre/logistic.c
index 945bd583..8c2a759f 100644
--- a/digital/io-hub/src/robospierre/logistic.c
+++ b/digital/io-hub/src/robospierre/logistic.c
@@ -192,11 +192,11 @@ logistic_update (void)
}
void
-logistic_element_new (uint8_t pos, uint8_t element)
+logistic_element_new (uint8_t pos, uint8_t element_type)
{
assert (pos < CLAMP_SLOT_NB);
assert (!ctx.slots[pos]);
- ctx.slots[pos] = element;
+ ctx.slots[pos] = element_type;
logistic_decision ();
}
diff --git a/digital/io-hub/src/robospierre/logistic.h b/digital/io-hub/src/robospierre/logistic.h
index c6aa4159..fd47bd1e 100644
--- a/digital/io-hub/src/robospierre/logistic.h
+++ b/digital/io-hub/src/robospierre/logistic.h
@@ -59,7 +59,7 @@ logistic_update (void);
/** To be called when a new element is entering the robot. */
void
-logistic_element_new (uint8_t pos, uint8_t element);
+logistic_element_new (uint8_t pos, uint8_t element_type);
/** To be called when a element movement is done. */
void