X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fcobboard%2Fspickle.c;h=62732c208cdfa24589dcba374bb5144396a3ae1c;hp=03565ac63a2f35021dbfacce82eee901eb66f03d;hb=0c4732c1e255ea56aa766b772dfdb6be49620830;hpb=57b3e145f2ff46e1a7e7d522c85f3c56821dbf48 diff --git a/projects/microb2010/cobboard/spickle.c b/projects/microb2010/cobboard/spickle.c index 03565ac..62732c2 100644 --- a/projects/microb2010/cobboard/spickle.c +++ b/projects/microb2010/cobboard/spickle.c @@ -1,6 +1,6 @@ -/* +/* * Copyright Droids Corporation (2009) - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -102,7 +102,7 @@ void spickle_set(void *mot, int32_t cmd) { static int32_t oldpos_left, oldpos_right; int32_t oldpos, pos, maxcmd, speed; - + if (mot == LEFT_SPICKLE_PWM) { pos = encoders_spi_get_value(LEFT_SPICKLE_ENCODER); oldpos = oldpos_left; @@ -176,7 +176,7 @@ void spickle_deploy(uint8_t side) void spickle_pack(uint8_t side) { - cs_set_consign(&spickle.csb[side]->cs, spickle.pos_deployed[side]); + cs_set_consign(&spickle.csb[side]->cs, spickle.pos_packed[side]); } uint16_t spickle_get_deploy_delay(uint8_t side)