X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Fcobboard%2Fmain.h;h=0d07a9c599cc271103714d9c2cbbf40f90472802;hp=a0dbac82f45f57475ce79adced56c27a8bee51b3;hb=0c4732c1e255ea56aa766b772dfdb6be49620830;hpb=a15451f8535228e9193b5dc042929ca0a7f79d9c diff --git a/projects/microb2010/cobboard/main.h b/projects/microb2010/cobboard/main.h index a0dbac8..0d07a9c 100755 --- a/projects/microb2010/cobboard/main.h +++ b/projects/microb2010/cobboard/main.h @@ -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 @@ -51,6 +51,8 @@ #define SHOVEL_ENCODER ((void *)2) #define SERVO_DOOR_PWM ((void *)&gen.servo2) +#define SERVO_CARRY_L_PWM ((void *)&gen.servo1) +#define SERVO_CARRY_R_PWM ((void *)&gen.servo3) #define LEFT_SPICKLE_PWM ((void *)&gen.pwm1_4A) #define RIGHT_SPICKLE_PWM ((void *)&gen.pwm2_4B) @@ -92,7 +94,7 @@ struct genboard { struct pwm_ng servo2; struct pwm_ng servo3; struct pwm_ng servo4; - + /* ax12 interface */ AX12 ax12; @@ -104,6 +106,7 @@ struct genboard { struct cs_block { uint8_t on; + int32_t prev; struct cs cs; struct pid_filter pid; struct quadramp_filter qr;