summaryrefslogtreecommitdiffhomepage
path: root/digital/io/src/getsamples.c
diff options
context:
space:
mode:
authorJérémy Dufour2008-04-14 12:06:01 +0200
committerJérémy Dufour2008-04-14 12:06:01 +0200
commitd3c8bf5e81f46d66ff0badcbcbf20a3d828a30eb (patch)
treef66be160813127528352eeed837d223d6f520fe4 /digital/io/src/getsamples.c
parent7a7c0bb8b26353b2e754b4eaa79125aed33b0279 (diff)
* digital/io/src
* build - add dependency of fsm.h for main.c (for bootstrap) ; - ensure it is building for host target. * get samples FSM - remove unneeded fields in the getsamples structures ; - rename it to be more 'private' (to prevent declaring the same one) ; * top FSM - rewrite it ; - still missing some parts to implement. * general - manage color of the bot ; - initialize the switch module in the main_init ; - add position of the gutter.
Diffstat (limited to 'digital/io/src/getsamples.c')
-rw-r--r--digital/io/src/getsamples.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/digital/io/src/getsamples.c b/digital/io/src/getsamples.c
index e68857a0..8cff594e 100644
--- a/digital/io/src/getsamples.c
+++ b/digital/io/src/getsamples.c
@@ -32,18 +32,15 @@
/**
* Get samples shared data.
*/
-struct getsamples_data_t getsamples_data;
+struct getsamples_data_t getsamples_data_;
/* Start the get samples FSM. */
void
getsamples_start (struct getsamples_data_t data)
{
/* Set parameters */
- getsamples_data.distributor_x = data.distributor_x;
- getsamples_data.distributor_y = data.distributor_y;
- getsamples_data.distributor_angle = data.distributor_angle;
- getsamples_data.sample_bitfield = data.sample_bitfield;
- getsamples_data.event = data.event;
+ getsamples_data_.approach_angle = data.approach_angle;
+ getsamples_data_.sample_bitfield = data.sample_bitfield;
/* Start the get samples FSM */
fsm_init (&getsamples_fsm);
@@ -59,12 +56,12 @@ getsamples_configure_classifier (void)
for (trap_num = 0; trap_num < trap_count; trap_num++)
{
/* Is the bit set? */
- if (bit_is_set (getsamples_data.sample_bitfield, trap_num))
+ if (bit_is_set (getsamples_data_.sample_bitfield, trap_num))
{
/* Configure the classifier */
trap_setup_path_to_box (trap_num);
/* Reset this bit */
- getsamples_data.sample_bitfield &= ~ _BV (trap_num);
+ getsamples_data_.sample_bitfield &= ~_BV (trap_num);
/* Stop here */
return;
}