X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=blobdiff_plain;f=projects%2Fmicrob2010%2Ftests%2Fhostsim%2Fcs.c;h=c2d0ff4e470b3ed27d99038e13ac62c26ee52be4;hp=8632a2324e644e3c58db99255872067580b68ed9;hb=a16ba178c7ef15fb408593b0e7c666ed2ed1d253;hpb=7d6a4a1f99a11437d608cbe61f07fac0e3d70ad1 diff --git a/projects/microb2010/tests/hostsim/cs.c b/projects/microb2010/tests/hostsim/cs.c index 8632a23..c2d0ff4 100644 --- a/projects/microb2010/tests/hostsim/cs.c +++ b/projects/microb2010/tests/hostsim/cs.c @@ -43,6 +43,8 @@ #include #include "robotsim.h" +#include "strat.h" +#include "actuator.h" #include "main.h" /* called every 5 ms */ @@ -88,11 +90,11 @@ static void do_cs(void *dummy) * compensation) */ position_manage(&mainboard.pos); } -#if 0 if (mainboard.flags & DO_BD) { bd_manage_from_cs(&mainboard.angle.bd, &mainboard.angle.cs); bd_manage_from_cs(&mainboard.distance.bd, &mainboard.distance.cs); } +#if 0 if (mainboard.flags & DO_TIMER) { uint8_t second; /* the robot should stop correctly in the strat, but @@ -152,8 +154,8 @@ void microb_cs_init(void) { /* ROBOT_SYSTEM */ rs_init(&mainboard.rs); - rs_set_left_pwm(&mainboard.rs, robotsim_pwm, LEFT_PWM); - rs_set_right_pwm(&mainboard.rs, robotsim_pwm, RIGHT_PWM); + rs_set_left_pwm(&mainboard.rs, pwm_set_and_save, LEFT_PWM); + rs_set_right_pwm(&mainboard.rs, pwm_set_and_save, RIGHT_PWM); /* increase gain to decrease dist, increase left and it will turn more left */ rs_set_left_ext_encoder(&mainboard.rs, robotsim_encoder_get, LEFT_ENCODER, IMP_COEF);